]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
xfrm: Remove unnecessary strscpy_pad() size arguments
authorThorsten Blum <thorsten.blum@linux.dev>
Thu, 20 Mar 2025 12:44:51 +0000 (13:44 +0100)
committerSteffen Klassert <steffen.klassert@secunet.com>
Fri, 11 Apr 2025 08:11:58 +0000 (10:11 +0200)
If the destination buffer has a fixed length, strscpy_pad()
automatically determines its size using sizeof() when the argument is
omitted. This makes the explicit sizeof() calls unnecessary - remove
them.

No functional changes intended.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/xfrm/xfrm_user.c

index 784a2d124749f5b31990a31ee48b916680046fb6..0a3d3f3ae5a300591ab65f72c8d0ffafc559b5ad 100644 (file)
@@ -1173,7 +1173,7 @@ static int copy_to_user_auth(struct xfrm_algo_auth *auth, struct sk_buff *skb)
        if (!nla)
                return -EMSGSIZE;
        algo = nla_data(nla);
-       strscpy_pad(algo->alg_name, auth->alg_name, sizeof(algo->alg_name));
+       strscpy_pad(algo->alg_name, auth->alg_name);
 
        if (redact_secret && auth->alg_key_len)
                memset(algo->alg_key, 0, (auth->alg_key_len + 7) / 8);
@@ -1186,7 +1186,7 @@ static int copy_to_user_auth(struct xfrm_algo_auth *auth, struct sk_buff *skb)
        if (!nla)
                return -EMSGSIZE;
        ap = nla_data(nla);
-       strscpy_pad(ap->alg_name, auth->alg_name, sizeof(ap->alg_name));
+       strscpy_pad(ap->alg_name, auth->alg_name);
        ap->alg_key_len = auth->alg_key_len;
        ap->alg_trunc_len = auth->alg_trunc_len;
        if (redact_secret && auth->alg_key_len)
@@ -1207,7 +1207,7 @@ static int copy_to_user_aead(struct xfrm_algo_aead *aead, struct sk_buff *skb)
                return -EMSGSIZE;
 
        ap = nla_data(nla);
-       strscpy_pad(ap->alg_name, aead->alg_name, sizeof(ap->alg_name));
+       strscpy_pad(ap->alg_name, aead->alg_name);
        ap->alg_key_len = aead->alg_key_len;
        ap->alg_icv_len = aead->alg_icv_len;
 
@@ -1229,7 +1229,7 @@ static int copy_to_user_ealg(struct xfrm_algo *ealg, struct sk_buff *skb)
                return -EMSGSIZE;
 
        ap = nla_data(nla);
-       strscpy_pad(ap->alg_name, ealg->alg_name, sizeof(ap->alg_name));
+       strscpy_pad(ap->alg_name, ealg->alg_name);
        ap->alg_key_len = ealg->alg_key_len;
 
        if (redact_secret && ealg->alg_key_len)
@@ -1250,7 +1250,7 @@ static int copy_to_user_calg(struct xfrm_algo *calg, struct sk_buff *skb)
                return -EMSGSIZE;
 
        ap = nla_data(nla);
-       strscpy_pad(ap->alg_name, calg->alg_name, sizeof(ap->alg_name));
+       strscpy_pad(ap->alg_name, calg->alg_name);
        ap->alg_key_len = 0;
 
        return 0;