linux-next: manual merge of the exfat tree with the origin tree

[Mark Brown]

Hi all,

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

  fs/exfat/nls.c

between commit:

  0af298e62e5cf ("treewide: refresh kmalloc_obj() conversions")

from the origin tree and commit:

  6a221c33aa528 ("exfat: validate upcase table bounds and length")

from the exfat 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 fs/exfat/nls.c
index 47aa187c54ccc,bec4d9e5e5bd9..0000000000000
--- a/fs/exfat/nls.c
+++ b/fs/exfat/nls.c
@@@ -655,7 -655,14 +655,14 @@@ static int exfat_load_upcase_table(stru
  	unsigned char skip = false;
  	unsigned short *upcase_table;
  
+ 	if (!tbl_size || (tbl_size & 1)) {
+ 		exfat_fs_error(sb,
+ 			       "bad upcase table size (%llu bytes). Please run fsck",
+ 			       tbl_size);
+ 		return -EINVAL;
+ 	}
+ 
 -	upcase_table = kvcalloc(UTBL_COUNT, sizeof(unsigned short), GFP_KERNEL);
 +	upcase_table = kvzalloc_objs(unsigned short, UTBL_COUNT);
  	if (!upcase_table)
  		return -ENOMEM;

Attachment: signature.asc
Description: PGP signature