mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
net: ipv4: fix clang -Wformat warnings
When building with Clang we encounter these warnings: | net/ipv4/ah4.c:513:4: error: format specifies type 'unsigned short' but | the argument has type 'int' [-Werror,-Wformat] | aalg_desc->uinfo.auth.icv_fullbits / 8); - | net/ipv4/esp4.c:1114:5: error: format specifies type 'unsigned short' | but the argument has type 'int' [-Werror,-Wformat] | aalg_desc->uinfo.auth.icv_fullbits / 8); `aalg_desc->uinfo.auth.icv_fullbits` is a u16 but due to default argument promotion becomes an int. Variadic functions (printf-like) undergo default argument promotion. Documentation/core-api/printk-formats.rst specifically recommends using the promoted-to-type's format flag. As per C11 6.3.1.1: (https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1548.pdf) `If an int can represent all values of the original type ..., the value is converted to an int; otherwise, it is converted to an unsigned int. These are called the integer promotions.` Thus it makes sense to change %hu to %d not only to follow this standard but to suppress the warning as well. Link: https://github.com/ClangBuiltLinux/linux/issues/378 Signed-off-by: Justin Stitt <justinstitt@google.com> Suggested-by: Joe Perches <joe@perches.com> Suggested-by: Nathan Chancellor <nathan@kernel.org> Suggested-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
parent
f85daf0e72
commit
e79b9473e9
2 changed files with 2 additions and 2 deletions
|
@ -507,7 +507,7 @@ static int ah_init_state(struct xfrm_state *x)
|
||||||
|
|
||||||
if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
|
if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
|
||||||
crypto_ahash_digestsize(ahash)) {
|
crypto_ahash_digestsize(ahash)) {
|
||||||
pr_info("%s: %s digestsize %u != %hu\n",
|
pr_info("%s: %s digestsize %u != %u\n",
|
||||||
__func__, x->aalg->alg_name,
|
__func__, x->aalg->alg_name,
|
||||||
crypto_ahash_digestsize(ahash),
|
crypto_ahash_digestsize(ahash),
|
||||||
aalg_desc->uinfo.auth.icv_fullbits / 8);
|
aalg_desc->uinfo.auth.icv_fullbits / 8);
|
||||||
|
|
|
@ -1108,7 +1108,7 @@ static int esp_init_authenc(struct xfrm_state *x)
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=
|
if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=
|
||||||
crypto_aead_authsize(aead)) {
|
crypto_aead_authsize(aead)) {
|
||||||
pr_info("ESP: %s digestsize %u != %hu\n",
|
pr_info("ESP: %s digestsize %u != %u\n",
|
||||||
x->aalg->alg_name,
|
x->aalg->alg_name,
|
||||||
crypto_aead_authsize(aead),
|
crypto_aead_authsize(aead),
|
||||||
aalg_desc->uinfo.auth.icv_fullbits / 8);
|
aalg_desc->uinfo.auth.icv_fullbits / 8);
|
||||||
|
|
Loading…
Reference in a new issue