Skip to content

Commit c4a5f00

Browse files
Cen Zhangklassert
authored andcommitted
xfrm: cache the offload ifindex for netlink dumps
copy_to_user_state_extra() only holds a reference to the outer xfrm_state. That does not pin x->xso.dev. NETDEV_DOWN and NETDEV_UNREGISTER can race through xfrm_dev_state_flush(), xfrm_state_delete(), and xfrm_dev_state_free(), which clears xso->dev and drops the netdev reference before the GETSA dump reaches xso_to_xuo() and reads xso->dev->ifindex. The buggy scenario involves two paths, with each column showing the order within that path: XFRM_MSG_GETSA dump path: NETDEV teardown path: 1. xfrm_get_sa() gets xfrm_state 1. xfrm_dev_state_flush() finds x 2. copy_to_user_state_extra() sees 2. xfrm_state_delete() removes x x->xso.dev from the SAD 3. copy_user_offload() calls 3. xfrm_dev_state_free() clears xso_to_xuo() xso->dev 4. xso->dev->ifindex dereferences 4. netdev_put() drops the device a detached net_device reference Avoid following the live net_device from the dump paths. Cache the attached ifindex in xfrm_dev_offload when state or policy offload is bound to a device, and serialize that snapshot instead. This preserves the user-visible XFRMA_OFFLOAD_DEV value without depending on the embedded net_device lifetime. Validation reproduced this kernel report: Oops: general protection fault Call Trace: <TASK> copy_to_user_state_extra+0xb8d/0x1370 [xfrm_user] ? __pfx_copy_to_user_state_extra+0x10/0x10 [xfrm_user] ? __asan_memset+0x23/0x50 ? srso_alias_return_thunk+0x5/0xfbef5 ? __alloc_skb+0x342/0x960 ? srso_alias_return_thunk+0x5/0xfbef5 ? __asan_memset+0x23/0x50 ? srso_alias_return_thunk+0x5/0xfbef5 ? __nlmsg_put+0x147/0x1b0 dump_one_state+0x1c7/0x3e0 [xfrm_user] xfrm_state_netlink+0xcb/0x130 [xfrm_user] ? __pfx_xfrm_state_netlink+0x10/0x10 [xfrm_user] ? srso_alias_return_thunk+0x5/0xfbef5 ? xfrm_user_state_lookup.constprop.0+0x230/0x310 [xfrm_user] xfrm_get_sa+0x102/0x250 [xfrm_user] ? __pfx_xfrm_get_sa+0x10/0x10 [xfrm_user] xfrm_user_rcv_msg+0x504/0xaa0 [xfrm_user] ? __pfx_xfrm_user_rcv_msg+0x10/0x10 [xfrm_user] ? srso_alias_return_thunk+0x5/0xfbef5 ? stack_trace_save+0x8e/0xc0 ? __pfx_stack_trace_save+0x10/0x10 netlink_rcv_skb+0x11f/0x350 ? __pfx_xfrm_user_rcv_msg+0x10/0x10 [xfrm_user] ? __pfx_netlink_rcv_skb+0x10/0x10 ? __pfx_mutex_lock+0x10/0x10 ? srso_alias_return_thunk+0x5/0xfbef5 xfrm_netlink_rcv+0x65/0x80 [xfrm_user] netlink_unicast+0x600/0x870 ? __pfx_netlink_unicast+0x10/0x10 ? srso_alias_return_thunk+0x5/0xfbef5 ? __pfx_stack_trace_save+0x10/0x10 netlink_sendmsg+0x75d/0xc10 ? __pfx_netlink_sendmsg+0x10/0x10 ? srso_alias_return_thunk+0x5/0xfbef5 ____sys_sendmsg+0x77a/0x900 ? srso_alias_return_thunk+0x5/0xfbef5 ? __pfx_____sys_sendmsg+0x10/0x10 ? __pfx_copy_msghdr_from_user+0x10/0x10 ? release_sock+0x1a/0x1d0 ? srso_alias_return_thunk+0x5/0xfbef5 ? netlink_insert+0x143/0xec0 ___sys_sendmsg+0xff/0x180 ? __pfx____sys_sendmsg+0x10/0x10 ? _raw_spin_lock_irqsave+0x85/0xe0 ? do_getsockname+0xf9/0x170 ? srso_alias_return_thunk+0x5/0xfbef5 ? fdget+0x53/0x3b0 __sys_sendmsg+0x111/0x1a0 ? __pfx___sys_sendmsg+0x10/0x10 ? srso_alias_return_thunk+0x5/0xfbef5 ? __sys_getsockname+0x8c/0x100 do_syscall_64+0x102/0x5a0 entry_SYSCALL_64_after_hwframe+0x77/0x7f Fixes: 07b87f9 ("xfrm: Fix unregister netdevice hang on hardware offload.") Assisted-by: Codex:gpt-5.5 Signed-off-by: Cen Zhang <zzzccc427@gmail.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
1 parent c283e9a commit c4a5f00

4 files changed

Lines changed: 33 additions & 9 deletions

File tree

include/net/xfrm.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ struct xfrm_dev_offload {
162162
*/
163163
struct net_device *real_dev;
164164
unsigned long offload_handle;
165+
/* Snapshot the attached device index for dump paths. */
166+
int ifindex;
165167
u8 dir : 2;
166168
u8 type : 2;
167169
u8 flags : 2;

net/xfrm/xfrm_device.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,
321321
}
322322

323323
xso->dev = dev;
324+
xso->ifindex = dev->ifindex;
324325
netdev_tracker_alloc(dev, &xso->dev_tracker, GFP_ATOMIC);
325326

326327
if (xuo->flags & XFRM_OFFLOAD_INBOUND)

net/xfrm/xfrm_state.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr,
15471547
xso->type = XFRM_DEV_OFFLOAD_PACKET;
15481548
xso->dir = xdo->dir;
15491549
xso->dev = dev;
1550+
xso->ifindex = dev->ifindex;
15501551
xso->flags = XFRM_DEV_OFFLOAD_FLAG_ACQ;
15511552
netdev_hold(dev, &xso->dev_tracker, GFP_ATOMIC);
15521553
error = dev->xfrmdev_ops->xdo_dev_state_add(dev, x,

net/xfrm/xfrm_user.c

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,17 +1201,26 @@ static int copy_sec_ctx(struct xfrm_sec_ctx *s, struct sk_buff *skb)
12011201
return 0;
12021202
}
12031203

1204-
static void xso_to_xuo(const struct xfrm_dev_offload *xso,
1205-
struct xfrm_user_offload *xuo)
1204+
static void xso_to_xuo_ifindex(const struct xfrm_dev_offload *xso, int ifindex,
1205+
struct xfrm_user_offload *xuo)
12061206
{
1207-
xuo->ifindex = xso->dev->ifindex;
1207+
xuo->ifindex = ifindex;
12081208
if (xso->dir == XFRM_DEV_OFFLOAD_IN)
12091209
xuo->flags = XFRM_OFFLOAD_INBOUND;
12101210
if (xso->type == XFRM_DEV_OFFLOAD_PACKET)
12111211
xuo->flags |= XFRM_OFFLOAD_PACKET;
12121212
}
12131213

1214-
static int copy_user_offload(struct xfrm_dev_offload *xso, struct sk_buff *skb)
1214+
#ifdef CONFIG_XFRM_MIGRATE
1215+
static void xso_to_xuo(const struct xfrm_dev_offload *xso,
1216+
struct xfrm_user_offload *xuo)
1217+
{
1218+
xso_to_xuo_ifindex(xso, xso->dev->ifindex, xuo);
1219+
}
1220+
#endif
1221+
1222+
static int copy_user_offload_ifindex(const struct xfrm_dev_offload *xso,
1223+
int ifindex, struct sk_buff *skb)
12151224
{
12161225
struct xfrm_user_offload *xuo;
12171226
struct nlattr *attr;
@@ -1222,11 +1231,22 @@ static int copy_user_offload(struct xfrm_dev_offload *xso, struct sk_buff *skb)
12221231

12231232
xuo = nla_data(attr);
12241233
memset(xuo, 0, sizeof(*xuo));
1225-
xso_to_xuo(xso, xuo);
1234+
xso_to_xuo_ifindex(xso, ifindex, xuo);
12261235

12271236
return 0;
12281237
}
12291238

1239+
static int copy_user_offload(struct xfrm_dev_offload *xso, struct sk_buff *skb)
1240+
{
1241+
return copy_user_offload_ifindex(xso, xso->dev->ifindex, skb);
1242+
}
1243+
1244+
static int copy_user_state_offload(const struct xfrm_dev_offload *xso,
1245+
struct sk_buff *skb)
1246+
{
1247+
return copy_user_offload_ifindex(xso, READ_ONCE(xso->ifindex), skb);
1248+
}
1249+
12301250
static bool xfrm_redact(void)
12311251
{
12321252
return IS_ENABLED(CONFIG_SECURITY) &&
@@ -1433,8 +1453,8 @@ static int copy_to_user_state_extra(struct xfrm_state *x,
14331453
&x->replay);
14341454
if (ret)
14351455
goto out;
1436-
if(x->xso.dev)
1437-
ret = copy_user_offload(&x->xso, skb);
1456+
if (READ_ONCE(x->xso.dev))
1457+
ret = copy_user_state_offload(&x->xso, skb);
14381458
if (ret)
14391459
goto out;
14401460
if (x->if_id) {
@@ -4046,8 +4066,8 @@ static inline unsigned int xfrm_sa_len(struct xfrm_state *x)
40464066
l += nla_total_size(sizeof(*x->coaddr));
40474067
if (x->props.extra_flags)
40484068
l += nla_total_size(sizeof(x->props.extra_flags));
4049-
if (x->xso.dev)
4050-
l += nla_total_size(sizeof(struct xfrm_user_offload));
4069+
if (READ_ONCE(x->xso.dev))
4070+
l += nla_total_size(sizeof(struct xfrm_user_offload));
40514071
if (x->props.smark.v | x->props.smark.m) {
40524072
l += nla_total_size(sizeof(x->props.smark.v));
40534073
l += nla_total_size(sizeof(x->props.smark.m));

0 commit comments

Comments
 (0)