linux-next: manual merge of the tip tree with the devsec-tsm-fixes tree

[Mark Brown]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  drivers/virt/coco/tdx-guest/tdx-guest.c

between commit:

  c3fd16c3b98ed ("virt: tdx-guest: Fix handling of host controlled 'quote' buffer length")

from the devsec-tsm-fixes tree and commit:

  0f409eaea53e4 ("virt: tdx-guest: Return error for GetQuote failures")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/virt/coco/tdx-guest/tdx-guest.c
index 7cee97559ba29,23ef3991c4d5a..0000000000000
--- a/drivers/virt/coco/tdx-guest/tdx-guest.c
+++ b/drivers/virt/coco/tdx-guest/tdx-guest.c
@@@ -309,12 -306,12 +309,17 @@@ static int tdx_report_new_locked(struc
  		return ret;
  	}
  
+ 	if (quote_buf->status != GET_QUOTE_SUCCESS) {
+ 		pr_debug("GetQuote request failed, status:%llx\n", quote_buf->status);
+ 		return -EIO;
+ 	}
+ 
 -	buf = kvmemdup(quote_buf->data, quote_buf->out_len, GFP_KERNEL);
 +	out_len = READ_ONCE(quote_buf->out_len);
 +
 +	if (out_len > TDX_QUOTE_MAX_LEN)
 +		return -EFBIG;
 +
 +	buf = kvmemdup(quote_buf->data, out_len, GFP_KERNEL);
  	if (!buf)
  		return -ENOMEM;

Attachment: signature.asc
Description: PGP signature