qiurui
/
linux-kernelorg-stable
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipsec-next-2025-09-26 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEH7ZpcWbFyOOp6OJbrB3Eaf9PW7cFAmjWItoACgkQrB3Eaf9P
 W7fxiQ/+LCrc5t3ChFM/l6vEnwp7fyEfcCoG3knPeB0e0HZlWnL8RlUvRMye+cEZ
 DYXBhcsHyjvWYgrX4SHnhPYQLTLJPqNyqi7aNK/mjN9RTP3z/qIQyzK2jOJEHSdk
 0GQyBajJzoUaP99HvS2C7BZ94MlMIWo0e/Jwakpca67GSg6bKH36lx028uqiLArL
 bWQGZXZR3iD05Iz+vEc087muidcvr7gy1kZakL/7oW1hy7KzLiGBBSoWF/gRYVcz
 c7rD4/meI14RPv+14fbgOEyo4DW1RaamNchJDGTgUS2KvJojTXX8pkyyBN2cV1h2
 XYsbqTG1143/tg4lDEqK+duw7XK93obIp4hXDdCJvndEbClxgKEv3RoOVBbwSEC+
 as2ovaQdSSgZzWChoT+qlNWkWziRCnRZU86A/Tzjdc0Tw08/QBh48sVTTjBtAw9c
 KM10FzFAVqvCAf2w2M3H2Uz3zOD2aqSIsCBC3N0XeIFWDSkpuEdCN84dNsaE38yW
 3e51xv2z83GFEH/fBola2cuTWY2X/5LOIOAiRZkIOEalJY6huUIrYttMYb1cWnrr
 SzxEPO+id/MZUqbybIrw8t0X5M8jsjqT13IB0PoJXSTK0rguaQ3jX2d3fdW35RLT
 Ry2h2JmC+UIrH+ZYayo8Sj4h24nWZy7bIwzQQOatOoN/mWoD6EI=
 =E6Dh
 -----END PGP SIGNATURE-----

Merge tag 'ipsec-next-2025-09-26' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2025-09-26

1) Fix field-spanning memcpy warning in AH output.
   From Charalampos Mitrodimas.

2) Replace the strcpy() calls for alg_name by strscpy().
   From Miguel García.

* tag 'ipsec-next-2025-09-26' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next:
  xfrm: xfrm_user: use strscpy() for alg_name
  net: ipv6: fix field-spanning memcpy warning in AH output
====================

Link: https://patch.msgid.link/20250926053025.2242061-1-steffen.klassert@secunet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2025-09-26 14:44:50 -07:00
parent 94aced6ed9 9f4f591cd5
commit ed6cfe861c
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
net/ipv6/ah6.c
View File

@ -46,6 +46,34 @@ struct ah_skb_cb {
#define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
/* Helper to save IPv6 addresses and extension headers to temporary storage */
static inline void ah6_save_hdrs(struct tmp_ext *iph_ext,
struct ipv6hdr *top_iph, int extlen)
{
if (!extlen)
return;
#if IS_ENABLED(CONFIG_IPV6_MIP6)
iph_ext->saddr = top_iph->saddr;
#endif
iph_ext->daddr = top_iph->daddr;
memcpy(&iph_ext->hdrs, top_iph + 1, extlen - sizeof(*iph_ext));
}
/* Helper to restore IPv6 addresses and extension headers from temporary storage */
static inline void ah6_restore_hdrs(struct ipv6hdr *top_iph,
struct tmp_ext *iph_ext, int extlen)
{
if (!extlen)
return;
#if IS_ENABLED(CONFIG_IPV6_MIP6)
top_iph->saddr = iph_ext->saddr;
#endif
top_iph->daddr = iph_ext->daddr;
memcpy(top_iph + 1, &iph_ext->hdrs, extlen - sizeof(*iph_ext));
}
static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
unsigned int size)
{
@ -301,13 +329,7 @@ static void ah6_output_done(void *data, int err)
memcpy(ah->auth_data, icv, ahp->icv_trunc_len);
memcpy(top_iph, iph_base, IPV6HDR_BASELEN);
if (extlen) {
#if IS_ENABLED(CONFIG_IPV6_MIP6)
memcpy(&top_iph->saddr, iph_ext, extlen);
#else
memcpy(&top_iph->daddr, iph_ext, extlen);
#endif
}
ah6_restore_hdrs(top_iph, iph_ext, extlen);
kfree(AH_SKB_CB(skb)->tmp);
xfrm_output_resume(skb->sk, skb, err);
@ -378,12 +400,8 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
*/
memcpy(iph_base, top_iph, IPV6HDR_BASELEN);
ah6_save_hdrs(iph_ext, top_iph, extlen);
if (extlen) {
#if IS_ENABLED(CONFIG_IPV6_MIP6)
memcpy(iph_ext, &top_iph->saddr, extlen);
#else
memcpy(iph_ext, &top_iph->daddr, extlen);
#endif
err = ipv6_clear_mutable_options(top_iph,
extlen - sizeof(*iph_ext) +
sizeof(*top_iph),
@ -434,13 +452,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
memcpy(ah->auth_data, icv, ahp->icv_trunc_len);
memcpy(top_iph, iph_base, IPV6HDR_BASELEN);
if (extlen) {
#if IS_ENABLED(CONFIG_IPV6_MIP6)
memcpy(&top_iph->saddr, iph_ext, extlen);
#else
memcpy(&top_iph->daddr, iph_ext, extlen);
#endif
}
ah6_restore_hdrs(top_iph, iph_ext, extlen);
out_free:
kfree(iph_base);

10
net/xfrm/xfrm_user.c
View File

@ -593,7 +593,7 @@ static int attach_one_algo(struct xfrm_algo **algpp, u8 *props,
if (!p)
return -ENOMEM;
strcpy(p->alg_name, algo->name);
strscpy(p->alg_name, algo->name);
*algpp = p;
return 0;
}
@ -620,7 +620,7 @@ static int attach_crypt(struct xfrm_state *x, struct nlattr *rta,
if (!p)
return -ENOMEM;
strcpy(p->alg_name, algo->name);
strscpy(p->alg_name, algo->name);
x->ealg = p;
x->geniv = algo->uinfo.encr.geniv;
return 0;
@ -649,7 +649,7 @@ static int attach_auth(struct xfrm_algo_auth **algpp, u8 *props,
if (!p)
return -ENOMEM;
strcpy(p->alg_name, algo->name);
strscpy(p->alg_name, algo->name);
p->alg_key_len = ualg->alg_key_len;
p->alg_trunc_len = algo->uinfo.auth.icv_truncbits;
memcpy(p->alg_key, ualg->alg_key, (ualg->alg_key_len + 7) / 8);
@ -684,7 +684,7 @@ static int attach_auth_trunc(struct xfrm_algo_auth **algpp, u8 *props,
if (!p)
return -ENOMEM;
strcpy(p->alg_name, algo->name);
strscpy(p->alg_name, algo->name);
if (!p->alg_trunc_len)
p->alg_trunc_len = algo->uinfo.auth.icv_truncbits;
@ -714,7 +714,7 @@ static int attach_aead(struct xfrm_state *x, struct nlattr *rta,
if (!p)
return -ENOMEM;
strcpy(p->alg_name, algo->name);
strscpy(p->alg_name, algo->name);
x->aead = p;
x->geniv = algo->uinfo.aead.geniv;
return 0;