udf: Fix -Wstringop-overflow warnings
PATCH 1/1 udf: Fix -Wstringop-overflow warnings
Use unsigned type in call to macro mint_t(). This avoids confusing the compiler about possible negative values that would cause the value in _len_ to wrap around.
Fixes the following -Wstringop-warnings seen when building ARM
architecture with allyesconfig (GCC 13):fs/udf/directory.c: In function 'udf_copy_fi':include/linux/fortify-string.h:57:33: warning: '__builtin_memcpy' specified bound between 2147483648 and 4294967295 exceeds maximum object size 2147483647 [-Wstringop-overflow=]
57 | #define __underlying_memcpy __builtin_memcpy
| ^
include/linux/fortify-string.h:648:9: note: in expansion of macro '__underlying_memcpy'
648 | __underlying_##op(p, q, __fortify_size); \
| ^~~~~~~~~~~~~
include/linux/fortify-string.h:693:26: note: in expansion of macro '__fortify_memcpy_chk'
693 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \
| ^~~~~~~~~~~~~~~~~~~~
fs/udf/directory.c:99:9: note: in expansion of macro 'memcpy'
99 | memcpy(&iter->fi, iter->bh[0]->b_data + off, len);
| ^~~~~~
include/linux/fortify-string.h:57:33: warning: '__builtin_memcpy' specified bound between 2147483648 and 4294967295 exceeds maximum object size 2147483647 [-Wstringop-overflow=]
57 | #define __underlying_memcpy __builtin_memcpy
| ^
include/linux/fortify-string.h:648:9: note: in expansion of macro '__underlying_memcpy'
648 | __underlying_##op(p, q, __fortify_size); \
| ^~~~~~~~~~~~~
include/linux/fortify-string.h:693:26: note: in expansion of macro '__fortify_memcpy_chk'
693 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \
| ^~~~~~~~~~~~~~~~~~~~
fs/udf/directory.c:99:9: note: in expansion of macro 'memcpy'
99 | memcpy(&iter->fi, iter->bh[0]->b_data + off, len);
| ^~~~~~ AR fs/udf/built-in.a
This helps with the ongoing efforts to globally enable -Wstringop-overflow.
--- fs/udf/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/udf/directory.c +1 -1
@@ -95,7 +95,7 @@ static int udf_copy_fi(struct udf_fileident_iter *iter) } off = iter->pos & (blksize -1 ); - len =min_t (int,sizeof (struct fileIdentDesc ), blksize - off); + len =min_t (u32,sizeof (struct fileIdentDesc ), blksize - off);memcpy (&iter->fi, iter->bh[0 ]->b_data + off, len);if (len <sizeof (struct fileIdentDesc )) memcpy((char *)(&iter->fi) + len, iter->bh[1]->b_data,
Signature · 1 line
2.34.1
Quoted 47 lines · Gustavo A. R. Silva
Use unsigned type in call to macro
mint_t(). This avoids confusing the compiler about possible negative values that would cause the value in _len_ to wrap around.Fixes the following -Wstringop-warnings seen when building ARM
architecture with allyesconfig (GCC 13):fs/udf/directory.c: In function 'udf_copy_fi':include/linux/fortify-string.h:57:33: warning: '__builtin_memcpy' specified bound between 2147483648 and 4294967295 exceeds maximum object size 2147483647 [-Wstringop-overflow=]57 | #define __underlying_memcpy __builtin_memcpy | ^ include/linux/fortify-string.h:648:9: note: in expansion of macro '__underlying_memcpy' 648 | __underlying_##op(p, q, __fortify_size); \ | ^~~~~~~~~~~~~ include/linux/fortify-string.h:693:26: note: in expansion of macro '__fortify_memcpy_chk' 693 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \ | ^~~~~~~~~~~~~~~~~~~~ fs/udf/directory.c:99:9: note: in expansion of macro 'memcpy' 99 | memcpy(&iter->fi, iter->bh[0]->b_data + off, len); | ^~~~~~ include/linux/fortify-string.h:57:33: warning: '__builtin_memcpy' specified bound between 2147483648 and 4294967295 exceeds maximum object size 2147483647 [-Wstringop-overflow=] 57 | #define __underlying_memcpy __builtin_memcpy | ^ include/linux/fortify-string.h:648:9: note: in expansion of macro '__underlying_memcpy' 648 | __underlying_##op(p, q, __fortify_size); \ | ^~~~~~~~~~~~~ include/linux/fortify-string.h:693:26: note: in expansion of macro '__fortify_memcpy_chk' 693 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \ | ^~~~~~~~~~~~~~~~~~~~ fs/udf/directory.c:99:9: note: in expansion of macro 'memcpy' 99 | memcpy(&iter->fi, iter->bh[0]->b_data + off, len); | ^~~~~~AR
fs/udf/built-in.aThis helps with the ongoing efforts to globally enable -Wstringop-overflow.
--- fs/udf/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/udf/directory.c +0
-0
fs/udf/directory.c static int udf_copy_fi(struct udf_fileident_iter *iter) · line 101
Quoted 8 lines
fs/udf/directory.c +1
-1@@ -95,7 +95,7 @@ static int udf_copy_fi(struct udf_fileident_iter *iter) } off = iter->pos & (blksize -1 ); - len =min_t (int,sizeof (struct fileIdentDesc ), blksize - off); + len =min_t (u32,sizeof (struct fileIdentDesc ), blksize - off);memcpy (&iter->fi, iter->bh[0 ]->b_data + off, len);if (len <sizeof (struct fileIdentDesc )) memcpy((char *)(&iter->fi) + len, iter->bh[1]->b_data,
len is u32, "off" can't be less than blksize, so this all looks correct to me. Thanks!
Signature · 1 line
Kees Cook
Quoted 60 lines · Kees Cook
Quoted 47 lines · Gustavo A. R. Silva
Use unsigned type in call to macro
mint_t(). This avoids confusing the compiler about possible negative values that would cause the value in _len_ to wrap around.Fixes the following -Wstringop-warnings seen when building ARM
architecture with allyesconfig (GCC 13):fs/udf/directory.c: In function 'udf_copy_fi':include/linux/fortify-string.h:57:33: warning: '__builtin_memcpy' specified bound between 2147483648 and 4294967295 exceeds maximum object size 2147483647 [-Wstringop-overflow=]57 | #define __underlying_memcpy __builtin_memcpy | ^ include/linux/fortify-string.h:648:9: note: in expansion of macro '__underlying_memcpy' 648 | __underlying_##op(p, q, __fortify_size); \ | ^~~~~~~~~~~~~ include/linux/fortify-string.h:693:26: note: in expansion of macro '__fortify_memcpy_chk' 693 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \ | ^~~~~~~~~~~~~~~~~~~~ fs/udf/directory.c:99:9: note: in expansion of macro 'memcpy' 99 | memcpy(&iter->fi, iter->bh[0]->b_data + off, len); | ^~~~~~ include/linux/fortify-string.h:57:33: warning: '__builtin_memcpy' specified bound between 2147483648 and 4294967295 exceeds maximum object size 2147483647 [-Wstringop-overflow=] 57 | #define __underlying_memcpy __builtin_memcpy | ^ include/linux/fortify-string.h:648:9: note: in expansion of macro '__underlying_memcpy' 648 | __underlying_##op(p, q, __fortify_size); \ | ^~~~~~~~~~~~~ include/linux/fortify-string.h:693:26: note: in expansion of macro '__fortify_memcpy_chk' 693 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \ | ^~~~~~~~~~~~~~~~~~~~ fs/udf/directory.c:99:9: note: in expansion of macro 'memcpy' 99 | memcpy(&iter->fi, iter->bh[0]->b_data + off, len); | ^~~~~~AR
fs/udf/built-in.aThis helps with the ongoing efforts to globally enable -Wstringop-overflow.
--- fs/udf/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/udf/directory.c +0
-0fs/udf/directory.c static int udf_copy_fi(struct udf_fileident_iter *iter) · line 101
Quoted 8 lines
fs/udf/directory.c +1
-1@@ -95,7 +95,7 @@ static int udf_copy_fi(struct udf_fileident_iter *iter) } off = iter->pos & (blksize -1 ); - len =min_t (int,sizeof (struct fileIdentDesc ), blksize - off); + len =min_t (u32,sizeof (struct fileIdentDesc ), blksize - off);memcpy (&iter->fi, iter->bh[0 ]->b_data + off, len);if (len <sizeof (struct fileIdentDesc )) memcpy((char *)(&iter->fi) + len, iter->bh[1]->b_data,len is u32, "off" can't be less than blksize, so this all looks correct to me. Thanks!
Quoted 1 line
Reviewed-by Kees Cook <[email protected]>
Thanks! I've merged the patch to my tree.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR