netlink: netlink_recvmsg() fix
Subsystems (2)
PATCH 1/1 netlink: netlink_recvmsg() fix
Please note following potential bug was discovered by code review, and my patch not even tested, please double check !
Thanks
[PATCH net-next-2.6] netlink: netlink_recvmsg() fix
commit 1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in case MSG_PEEK is used.
An skb given by skb_recv_datagram() might be shared, we must clone it before any modification, or risk fatal corruption.
--- net/netlink/af_netlink.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
net/netlink/af_netlink.c +12 -7
@@ -1405,7 +1405,7 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,struct netlink_sock *nlk =nlk_sk (sk);int noblock = flags&MSG_DONTWAIT ;size_t copied; -struct sk_buff *skb, *frag__maybe_unused =NULL ; +struct sk_buff *skb;int err;if (flags&MSG_OOB )
@@ -1440,8 +1440,17 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,kfree_skb (skb); skb = compskb; }else { - frag =skb_shinfo (skb)->frag_list; -skb_shinfo (skb)->frag_list =NULL ; +struct sk_buff *nskb =skb_clone (skb,GFP_KERNEL ); + +if (!nskb) { +skb_free_datagram (sk, skb); + err = -ENOMEM ; + goto out; + } +kfree_skb (skb); +kfree_skb (skb_shinfo (nskb)->frag_list); +skb_shinfo (nskb)->frag_list =NULL ; + skb = nskb; } }#endif
@@ -1477,10 +1486,6 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,if (flags &MSG_TRUNC ) copied = skb->len; -#ifdef CONFIG_COMPAT_NETLINK_MESSAGES -skb_shinfo (skb)->frag_list = frag; -#endif -skb_free_datagram (sk, skb);if (nlk->cb &&atomic_read (&sk->sk_rmem_alloc) <= sk->sk_rcvbuf /2 )
Quoted 11 lines · Eric Dumazet
Please note following potential bug was discovered by code review, and my patch not even tested, please double check !
Thanks
[PATCH net-next-2.6] netlink:
netlink_recvmsg()fixcommit
1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in caseMSG_PEEKis used.
Quoted 5 lines
An skb given by
skb_recv_datagram()might be shared, we must clone it before any modification, or risk fatal corruption.Signed-off-by Eric Dumazet <[email protected]>---
Oh well, skb_copy() or skb_unshare() is needed.
[PATCH net-next-2.6 v2] netlink: netlink_recvmsg() fix
commit 1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in case MSG_PEEK is used.
An skb given by skb_recv_datagram() might be shared, we must copy it before any modification, or risk fatal corruption.
--- net/netlink/af_netlink.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
net/netlink/af_netlink.c +7 -6
@@ -1405,7 +1405,7 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,struct netlink_sock *nlk =nlk_sk (sk);int noblock = flags&MSG_DONTWAIT ;size_t copied; -struct sk_buff *skb, *frag__maybe_unused =NULL ; +struct sk_buff *skb;int err;if (flags&MSG_OOB )
@@ -1440,7 +1440,12 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,kfree_skb (skb); skb = compskb; }else { - frag =skb_shinfo (skb)->frag_list; + skb =skb_unshare (skb,GFP_KERNEL ); +if (!skb) { + err = -ENOMEM ; + goto out; + } +kfree_skb (skb_shinfo (skb)->frag_list);skb_shinfo (skb)->frag_list =NULL ; } }
@@ -1477,10 +1482,6 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,if (flags &MSG_TRUNC ) copied = skb->len; -#ifdef CONFIG_COMPAT_NETLINK_MESSAGES -skb_shinfo (skb)->frag_list = frag; -#endif -skb_free_datagram (sk, skb);if (nlk->cb &&atomic_read (&sk->sk_rmem_alloc) <= sk->sk_rcvbuf /2 )
Quoted 8 lines · Eric Dumazet
[PATCH net-next-2.6 v2] netlink:
netlink_recvmsg()fixcommit
1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in caseMSG_PEEKis used.An skb given by
skb_recv_datagram()might be shared, we must copy it before any modification, or risk fatal corruption.
Makes sense to me, seeing that if you MSG_PEEK it just increases skb->users. But nothing could touch the other skb at the same time? Although I guess with netlink multicast we have a similar situation.
johannes
Quoted 46 lines
Signed-off-by Eric Dumazet <[email protected]>--- net/netlink/af_netlink.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)net/netlink/af_netlink.c +7
-6@@ -1405,7 +1405,7 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,struct netlink_sock *nlk =nlk_sk (sk);int noblock = flags&MSG_DONTWAIT ;size_t copied; -struct sk_buff *skb, *frag__maybe_unused =NULL ; +struct sk_buff *skb;int err;if (flags&MSG_OOB )@@ -1440,7 +1440,12 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,kfree_skb (skb); skb = compskb; }else { - frag =skb_shinfo (skb)->frag_list; + skb =skb_unshare (skb,GFP_KERNEL ); +if (!skb) { + err = -ENOMEM ; + goto out; + } +kfree_skb (skb_shinfo (skb)->frag_list);skb_shinfo (skb)->frag_list =NULL ; } }@@ -1477,10 +1482,6 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,if (flags &MSG_TRUNC ) copied = skb->len; -#ifdef CONFIG_COMPAT_NETLINK_MESSAGES -skb_shinfo (skb)->frag_list = frag; -#endif -skb_free_datagram (sk, skb);if (nlk->cb &&atomic_read (&sk->sk_rmem_alloc) <= sk->sk_rcvbuf /2 )
Quoted 8 lines · Johannes Berg
Quoted 6 lines · Eric Dumazet
[PATCH net-next-2.6 v2] netlink:
netlink_recvmsg()fixcommit
1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in caseMSG_PEEKis used.
Quoted 6 lines
Quoted 2 lines
An skb given by
skb_recv_datagram()might be shared, we must copy it before any modification, or risk fatal corruption.Makes sense to me, seeing that if you
MSG_PEEKit just increasesskb->users. But nothing could touch the other skb at the same time? Although I guess with netlink multicast we have a similar situation.
Nothing can touch this skb at the same time but us and our friends (consumers that did a skb_recv_datagram( MSG_PEEK ) operation).
Oh well, I see skb_unshare() tests skb_cloned(). This is not what we want.
We probably wants something like :
if (skb_shared(skb)) {
nsbk = skb_copy(skb, GFP_KERNEL);
...
}Quoted 6 lines · Eric Dumazet
Nothing can touch this skb at the same time but us and our friends (consumers that did a
skb_recv_datagram( MSG_PEEK )operation).Oh well, I see
skb_unshare()testsskb_cloned(). This is not what we want.
Here is V3 of this patch.
Thanks
[PATCH net-next-2.6 v3] netlink: netlink_recvmsg() fix
commit 1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in case MSG_PEEK is used.
An skb given by skb_recv_datagram() might be shared, we must copy it before any modification, or risk fatal corruption.
--- net/netlink/af_netlink.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
net/netlink/af_netlink.c +16 -6
@@ -1405,7 +1405,7 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,struct netlink_sock *nlk =nlk_sk (sk);int noblock = flags&MSG_DONTWAIT ;size_t copied; -struct sk_buff *skb, *frag__maybe_unused =NULL ; +struct sk_buff *skb;int err;if (flags&MSG_OOB )
@@ -1440,7 +1440,21 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,kfree_skb (skb); skb = compskb; }else { - frag =skb_shinfo (skb)->frag_list; +/* +* Before setting frag_list to NULL, we must get a +* private copy of skb if shared (because of MSG_PEEK) +*/ + if (skb_shared(skb) { +struct sk_buff *nskb; + + nskb =pskb_copy (skb,GFP_KERNEL ); +kfree_skb (skb); + skb = nskb; + err = -ENOMEM ; +if (!skb) + goto out; + } +kfree_skb (skb_shinfo (skb)->frag_list);skb_shinfo (skb)->frag_list =NULL ; } }
@@ -1477,10 +1491,6 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,if (flags &MSG_TRUNC ) copied = skb->len; -#ifdef CONFIG_COMPAT_NETLINK_MESSAGES -skb_shinfo (skb)->frag_list = frag; -#endif -skb_free_datagram (sk, skb);if (nlk->cb &&atomic_read (&sk->sk_rmem_alloc) <= sk->sk_rcvbuf /2 )
From: Eric Dumazet <[email protected]>
Date: Wed, 21 Jul 2010 10:43:55 +0200
Quoted 10 lines
[PATCH net-next-2.6 v3] netlink:
netlink_recvmsg()fixcommit
1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in caseMSG_PEEKis used.An skb given by
skb_recv_datagram()might be shared, we must copy it before any modification, or risk fatal corruption.Signed-off-by Eric Dumazet <[email protected]>
Applied, thanks Eric.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Sun, 25 Jul 2010 21:55:48 -0700 (PDT)
Quoted 9 lines
From: Eric Dumazet <[email protected]>
Date: Wed, 21 Jul 2010 10:43:55 +0200Quoted 6 lines
[PATCH net-next-2.6 v3] netlink:
netlink_recvmsg()fixcommit
1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in caseMSG_PEEKis used.
Quoted 6 lines
Quoted 4 lines
An skb given by
skb_recv_datagram()might be shared, we must copy it before any modification, or risk fatal corruption.Signed-off-by Eric Dumazet <[email protected]>Applied, thanks Eric.
I bet you didn't compile test the code you modified at all, but it's not your fault :-)
The code is protected by CONFIG_WIRELESS_EXT but that protection is not valid. It should be protected by something like CONFIG_WEXT_CORE or similar.
The only way to get CONFIG_WIRELESS_EXT set it to enable one of a few drivers, many of which are in staging.
Anyways, just a heads up, I'll fix this up.
Quoted 11 lines · David Miller
I bet you didn't compile test the code you modified at all, but it's not your fault :-)
The code is protected by
CONFIG_WIRELESS_EXTbut that protection is not valid. It should be protected by something likeCONFIG_WEXT_COREor similar.The only way to get
CONFIG_WIRELESS_EXTset it to enable one of a few drivers, many of which are in staging.Anyways, just a heads up, I'll fix this up.
Well, I recall having compiled (but not boot tested) patches, on my x86_64 dev machine with a .config containing :
# grep WIRELESS_EXT .config CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y # grep COMPAT_NETLINK_MESSAGES .config CONFIG_COMPAT_NETLINK_MESSAGES=y
Cannot remember if I compiled v3 of the patch, to be honest.
Thanks
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Mon, 26 Jul 2010 22:39:03 +0200
Quoted 1 line
Cannot remember if I compiled v3 of the patch, to be honest.
It's impossible that you did so, there is a missing closing parenthesis in the first if() statement added by your patch :-)
Quoted 8 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Mon, 26 Jul 2010 22:39:03 +0200Quoted 1 line
Cannot remember if I compiled v3 of the patch, to be honest.
It's impossible that you did so, there is a missing closing parenthesis in the first
if()statement added by your patch :-)
Oops
Yes, I realized this shortly after sending my previous mail :)
Thanks
Quoted 9 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Wed, 21 Jul 2010 10:43:55 +0200Quoted 6 lines
[PATCH net-next-2.6 v3] netlink:
netlink_recvmsg()fixcommit
1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in caseMSG_PEEKis used.
Quoted 6 lines
Quoted 4 lines
An skb given by
skb_recv_datagram()might be shared, we must copy it before any modification, or risk fatal corruption.Signed-off-by Eric Dumazet <[email protected]>Applied, thanks Eric.
I keep getting errors like below in 2.6.35+wireless-testing. Not saying that it's this patch's fault, but it is the only thing I remember touching that area.
[10548.768754] ============================================================================= [10548.773474] BUG kmalloc-4096: Object already free [10548.775342] ----------------------------------------------------------------------------- [10548.775344] [10548.778505] INFO: Allocated in wireless_send_event+0x1f2/0x410 age=1 cpu=0 pid=28521 [10548.778505] INFO: Freed in skb_release_data+0xd0/0xe0 age=2 cpu=2 pid=27730 [10548.778505] INFO: Slab 0xffffea0003fa4b80 objects=7 used=1 fp=0xffff880122f12090 flags=0x80000000000040c3 [10548.778505] INFO: Object 0xffff880122f12090 @offset=8336 fp=0xffff880122f11048 [10548.778505] [10548.778505] Bytes b4 0xffff880122f12080: 6c a3 0f 00 01 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a l�......ZZZZZZZZ ... [10548.778505] Object 0xffff880122f13080: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b a5 kkkkkkkkkkkkkkk� [10548.778505] Redzone 0xffff880122f13090: bb bb bb bb bb bb bb bb �������� [10548.778505] Padding 0xffff880122f130d0: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ [10548.778505] Pid: 916, comm: avahi-daemon Tainted: G W 2.6.35-wl-67184-g1595c70-dirty #12 [10548.778505] Call Trace: [10548.778505] [<ffffffff81133993>] print_trailer+0x103/0x160 [10548.778505] [<ffffffff81133a31>] object_err+0x41/0x50 [10548.778505] [<ffffffff81135b0f>] __slab_free+0x24f/0x3b0 [10548.778505] [<ffffffff81135da2>] kfree+0x132/0x1a0 [10548.778505] [<ffffffff81383710>] skb_release_data+0xd0/0xe0 [10548.778505] [<ffffffff813831be>] __kfree_skb+0x1e/0xa0 [10548.778505] [<ffffffff813832c2>] kfree_skb+0x42/0xb0 [10548.778505] [<ffffffff813ac3f2>] netlink_recvmsg+0x422/0x480 [10548.778505] [<ffffffff8137afdd>] sock_recvmsg+0xfd/0x130 [10548.778505] [<ffffffff8137c1e4>] __sys_recvmsg+0x144/0x2e0 [10548.778505] [<ffffffff8137c629>] sys_recvmsg+0x49/0x80 [10548.778505] [<ffffffff8100b132>] system_call_fastpath+0x16/0x1b [10548.778505] FIX kmalloc-4096: Object at 0xffff880122f12090 not freed
johannes
Quoted 13 lines · Johannes Berg
Quoted 12 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Wed, 21 Jul 2010 10:43:55 +0200Quoted 9 lines
[PATCH net-next-2.6 v3] netlink:
netlink_recvmsg()fixcommit
1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in caseMSG_PEEKis used.An skb given by
skb_recv_datagram()might be shared, we must copy it before any modification, or risk fatal corruption.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Eric Dumazet <[email protected]>Applied, thanks Eric.
I keep getting errors like below in 2.6.35+wireless-testing. Not saying that it's this patch's fault, but it is the only thing I remember touching that area.
In fact, I think something's wrong with this patch, since my comment (that right now unfortunately I no longer fully understand) says:
* If this skb has a frag_list, then here that means that
* we will have to use the frag_list skb for compat tasks
* and the regular skb for non-compat tasks.
*
* The skb might (and likely will) be cloned, so we can't
* just reset frag_list and go on with things -- we need to
* keep that. For the compat case that's easy -- simply get
* a reference to the compat skb and free the regular one
* including the frag. For the non-compat case, we need to
* avoid sending the frag to the user -- so assign NULL but
* restore it below before freeing the skb.
and that's no longer true, afaict.
johannes
Quoted 37 lines · Johannes Berg
Quoted 13 lines · Johannes Berg
Quoted 12 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Wed, 21 Jul 2010 10:43:55 +0200Quoted 9 lines
[PATCH net-next-2.6 v3] netlink:
netlink_recvmsg()fixcommit
1dacc76d0014
(net/compat/wext: send different messages to compat tasks) introduced a race condition on netlink, in caseMSG_PEEKis used.An skb given by
skb_recv_datagram()might be shared, we must copy it before any modification, or risk fatal corruption.Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Eric Dumazet <[email protected]>Applied, thanks Eric.
I keep getting errors like below in 2.6.35+wireless-testing. Not saying that it's this patch's fault, but it is the only thing I remember touching that area.
In fact, I think something's wrong with this patch, since my comment (that right now unfortunately I no longer fully understand) says:
* If this skb has a
frag_list, then here that means that
* we will have to use thefrag_listskb for compat tasks
* and the regular skb for non-compat tasks.
*
* The skb might (and likely will) be cloned, so we can't
* just resetfrag_listand go on with things -- we need to
* keep that. For the compat case that's easy -- simply get
* a reference to the compat skb and free the regular one
* including the frag. For the non-compat case, we need to
* avoid sending the frag to the user -- so assign NULL but
* restore it below before freeing the skb.
Quoted 2 lines
and that's no longer true, afaict.
Comment was not updated by the patch.
But do you agree temporarly setting frag_list to NULL was a bug ?
Unfortunatly I cannot test this path...
I assume reverting 1235f504aaba removes these errors ?
Its strange we have a double-free on a data part and not a skb_head.
maybe pskb_copy() has a problem with frag_list...
Maybe we can revert the patch and find another way to make sure two process can not manipulate this skb in // (adding a mutex, or using RTNL ?)
Quoted 12 lines · Eric Dumazet
Quoted 12 lines
* If this skb has a
frag_list, then here that means that
* we will have to use thefrag_listskb for compat tasks
* and the regular skb for non-compat tasks.
*
* The skb might (and likely will) be cloned, so we can't
* just resetfrag_listand go on with things -- we need to
* keep that. For the compat case that's easy -- simply get
* a reference to the compat skb and free the regular one
* including the frag. For the non-compat case, we need to
* avoid sending the frag to the user -- so assign NULL but
* restore it below before freeing the skb.
Quoted 6 lines
Quoted 2 lines
and that's no longer true, afaict.
Comment was not updated by the patch.
But do you agree temporarly setting
frag_listto NULL was a bug ?
No, that was actually intentional, as the comment describes?
Quoted 1 line
Unfortunatly I cannot test this path...
No wireless devices? :)
Quoted 1 line
I assume reverting
1235f504aabaremoves these errors ?
I haven't tried yet, but it only happened very recently and I didn't find any other candidate -- the error always points to wireless_send_event too.
Quoted 1 line
Its strange we have a double-free on a data part and not a
skb_head.
There also was an apparent use-after-free error.
Quoted 6 lines
maybe
pskb_copy()has a problem withfrag_list...Maybe we can revert the patch and find another way to make sure two process can not manipulate this skb in // (adding a mutex, or using RTNL ?)
I'm getting confused. Why did I think the NULLing and then restoring was not racy to start with?
johannes
David Miller
maintainerFrom: Johannes Berg <[email protected]>
Date: Fri, 13 Aug 2010 17:13:53 +0200
Quoted 7 lines · Eric Dumazet
Quoted 2 lines
I assume reverting
1235f504aabaremoves these errors ?I haven't tried yet, but it only happened very recently and I didn't find any other candidate -- the error always points to
wireless_send_eventtoo.
Please test with the commit reverted and let us know if it helps.
The current situation is worse than what we were trying to fix in that commit, so if a revert fixes your problem then as Eric said we should do that first.
Quoted 11 lines · David Miller
From: Johannes Berg <[email protected]>
Date: Fri, 13 Aug 2010 17:13:53 +0200Quoted 7 lines · Eric Dumazet
Quoted 2 lines
I assume reverting
1235f504aabaremoves these errors ?I haven't tried yet, but it only happened very recently and I didn't find any other candidate -- the error always points to
wireless_send_eventtoo.
Quoted 5 lines
Please test with the commit reverted and let us know if it helps.
The current situation is worse than what we were trying to fix in that commit, so if a revert fixes your problem then as Eric said we should do that first.
I haven't gotten around to it, but Kalle had been running into the same issue and said reverting it fixed it:
http://article.gmane.org/gmane.linux.kernel.wireless.general/54492
johannes
Quoted 5 lines · Johannes Berg
I haven't gotten around to it, but Kalle had been running into the same issue and said reverting it fixed it:
http://article.gmane.org/gmane.linux.kernel.wireless.general/54492
Thanks Johannes
Please David revert 1235f504.
We'll find another way to address the problem.
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Mon, 16 Aug 2010 08:10:02 +0200
Quoted 5 lines · Johannes Berg
Quoted 4 lines
I haven't gotten around to it, but Kalle had been running into the same issue and said reverting it fixed it:
Quoted 8 lines
Thanks Johannes
Please David revert
1235f504.We'll find another way to address the problem.
I will, thanks guys.
Quoted 1 line · Eric Dumazet
We'll find another way to address the problem.
For my understanding: The problem is that the save/restore of the frag_list skb can race so a second reader will not see the frag_list skb because it gets there while it's NULL. This happens with MSG_PEEK, or with clones of the SKB since skb_shared_info is invariant across clones.
Correct?
johannes
Quoted 11 lines · Johannes Berg
Quoted 1 line · Eric Dumazet
We'll find another way to address the problem.
For my understanding: The problem is that the save/restore of the
frag_listskb can race so a second reader will not see thefrag_listskb because it gets there while it's NULL. This happens withMSG_PEEK, or with clones of the SKB sinceskb_shared_infois invariant across clones.Correct?
Yes
I believe we should have a mutual exclusion for the critical section.
(setting pointer to NULL, ...., setting pointer back to its orig value)
Quoted 10 lines · Eric Dumazet
Quoted 9 lines · Johannes Berg
Quoted 1 line · Eric Dumazet
We'll find another way to address the problem.
For my understanding: The problem is that the save/restore of the
frag_listskb can race so a second reader will not see thefrag_listskb because it gets there while it's NULL. This happens withMSG_PEEK, or with clones of the SKB sinceskb_shared_infois invariant across clones.
Quoted 8 lines
Quoted 2 lines
Correct?
Yes
I believe we should have a mutual exclusion for the critical section.
(setting pointer to NULL, ...., setting pointer back to its orig value)
Yeah, that'd work, but I'm wondering now why I did this at all. The code already restricts the data copying to skb->len, which will not include the frag_list, so it should be OK to just leave it intact? I'll go and look at that in more detail and try it.
johannes
PATCH 1/1 netlink: fix compat recvmsg
In reply to Eric DumazetFrom: Johannes Berg <[email protected]>
Since
commit 1dacc76d0014a034b8aca14237c127d7c19d7726
Author: Johannes Berg <[email protected]> Date: Wed Jul 1 11:26:02 2009 +0000
net/compat/wext: send different messages to compat tasks
we had a race condition when setting and then restoring frag_list. Eric attempted to fix it, but the fix created even worse problems.
However, the original motivation I had when I added the code that turned out to be racy is no longer clear to me, since we only copy up to skb->len to userspace, which doesn't include the frag_list length. As a result, not doing any frag_list clearing and restoring avoids the race condition, while not introducing any other problems.
Additionally, while preparing this patch I found that since none of the remaining netlink code is really aware of the frag_list, we need to use the original skb's information for packet information and credentials. This fixes, for example, the group information received by compat tasks.
--- net/netlink/af_netlink.c | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-)
net/netlink/af_netlink.c +16 -30
@@ -1406,7 +1406,7 @@ static int netlink_recvmsg(struct kiocbstruct netlink_sock *nlk =nlk_sk (sk);int noblock = flags&MSG_DONTWAIT ;size_t copied; -struct sk_buff *skb, *frag__maybe_unused =NULL ; +struct sk_buff *skb, *data_skb;int err;if (flags&MSG_OOB )
@@ -1418,45 +1418,35 @@ static int netlink_recvmsg(struct kiocbif (skb ==NULL ) goto out; + data_skb = skb; +#ifdef CONFIG_COMPAT_NETLINK_MESSAGES if (unlikely (skb_shinfo (skb)->frag_list)) { -bool need_compat = !!(flags &MSG_CMSG_COMPAT ); -/* -* If this skb has a frag_list, then here that means that -* we will have to use the frag_list skb for compat tasks -* and the regular skb for non-compat tasks. +* If this skb has a frag_list, then here that means that we +* will have to use the frag_list skb's data for compat tasks +* and the regular skb's data for normal (non-compat) tasks. * -* The skb might (and likely will) be cloned, so we can't -* just reset frag_list and go on with things -- we need to -* keep that. For the compat case that's easy -- simply get -* a reference to the compat skb and free the regular one -* including the frag. For the non-compat case, we need to -* avoid sending the frag to the user -- so assign NULL but -* restore it below before freeing the skb. +* If we need to send the compat skb, assign it to the +* 'data_skb' variable so that it will be used below for data +* copying. We keep 'skb' for everything else, including +* freeing both later. */ -if (need_compat) { -struct sk_buff *compskb =skb_shinfo (skb)->frag_list; -skb_get (compskb); -kfree_skb (skb); - skb = compskb; - }else { - frag =skb_shinfo (skb)->frag_list; -skb_shinfo (skb)->frag_list =NULL ; - } +if (flags &MSG_CMSG_COMPAT ) + data_skb =skb_shinfo (skb)->frag_list; }#endif msg->msg_namelen =0 ; - copied = skb->len; + copied = data_skb->len;if (len < copied) { msg->msg_flags |=MSG_TRUNC ; copied = len; } -skb_reset_transport_header (skb); - err =skb_copy_datagram_iovec (skb,0 , msg->msg_iov, copied); +skb_reset_transport_header (data_skb); + err =skb_copy_datagram_iovec (data_skb,0 , msg->msg_iov, copied);if (msg->msg_name) {struct sockaddr_nl *addr = (struct sockaddr_nl *)msg->msg_name;
@@ -1476,11 +1466,7 @@ static int netlink_recvmsg(struct kiocb } siocb->scm->creds = *NETLINK_CREDS (skb);if (flags &MSG_TRUNC ) - copied = skb->len; - -#ifdef CONFIG_COMPAT_NETLINK_MESSAGES -skb_shinfo (skb)->frag_list = frag; -#endif + copied = data_skb->len;skb_free_datagram (sk, skb);
Re: [PATCH] netlink: fix compat recvmsg
Quoted 29 lines · Johannes Berg
From: Johannes Berg <[email protected]>
Since
commit1dacc76d0014a034b8aca14237c127d7c19d7726Author: Johannes Berg <[email protected]> Date: Wed Jul 1 11:26:02 2009 +0000
net/compat/wext: send different messages to compat taskswe had a race condition when setting and then restoring
frag_list. Eric attempted to fix it, but the fix created even worse problems.However, the original motivation I had when I added the code that turned out to be racy is no longer clear to me, since we only copy up to
skb->lento userspace, which doesn't include thefrag_listlength. As a result, not doing anyfrag_listclearing and restoring avoids the race condition, while not introducing any other problems.Additionally, while preparing this patch I found that since none of the remaining netlink code is really aware of the
frag_list, we need to use the original skb's information for packet information and credentials. This fixes, for example, the group information received by compat tasks.
Quoted 4 lines
Cc Eric Dumazet <[email protected]>Cc [email protected] [2.6.31+, for 2.6.35 revert 1235f504aa]Signed-off-by Johannes Berg <[email protected]>---
As a side effect, it might fix the
if (nlk->flags & NETLINK_RECV_PKTINFO) netlink_cmsg_recv_pktinfo(msg, skb);
That tried to use pktinfo from the slave skb. After this patch, skb points to master skb.
Thanks !
Re: [PATCH] netlink: fix compat recvmsg
Quoted 7 lines · Eric Dumazet
Quoted 6 lines
Additionally, while preparing this patch I found that since none of the remaining netlink code is really aware of the
frag_list, we need to use the original skb's information for packet information and credentials. This fixes, for example, the group information received by compat tasks.
Quoted 7 lines
As a side effect, it might fix the
if (nlk->flags & NETLINK_RECV_PKTINFO) netlink_cmsg_recv_pktinfo(msg, skb);That tried to use pktinfo from the slave skb. After this patch, skb points to master skb.
Yeah, that's what I was looking at regarding the "packet information" I wrote about. The group information was wrong (0 rather than 1), I could see that in strace (though I had to compile a strace64 binary first...)
Quoted 3 lines
Acked-by Eric Dumazet <[email protected]>Thanks !
Thanks for looking, and finding the bug to start with :-)
johannes
Re: [PATCH] netlink: fix compat recvmsg
In reply to Eric DumazetQuoted 35 lines · Eric Dumazet
Quoted 29 lines · Johannes Berg
From: Johannes Berg <[email protected]>
Since
commit1dacc76d0014a034b8aca14237c127d7c19d7726Author: Johannes Berg <[email protected]> Date: Wed Jul 1 11:26:02 2009 +0000
net/compat/wext: send different messages to compat taskswe had a race condition when setting and then restoring
frag_list. Eric attempted to fix it, but the fix created even worse problems.However, the original motivation I had when I added the code that turned out to be racy is no longer clear to me, since we only copy up to
skb->lento userspace, which doesn't include thefrag_listlength. As a result, not doing anyfrag_listclearing and restoring avoids the race condition, while not introducing any other problems.Additionally, while preparing this patch I found that since none of the remaining netlink code is really aware of the
frag_list, we need to use the original skb's information for packet information and credentials. This fixes, for example, the group information received by compat tasks.Quoted 4 lines
Cc Eric Dumazet <[email protected]>Cc [email protected] [2.6.31+, for 2.6.35 revert 1235f504aa]Signed-off-by Johannes Berg <[email protected]>---
Quoted 8 lines
As a side effect, it might fix the
if (nlk->flags & NETLINK_RECV_PKTINFO) netlink_cmsg_recv_pktinfo(msg, skb);That tried to use pktinfo from the slave skb. After this patch, skb points to master skb.
As you already mentioned it in your changelog, I missed it ;)
Re: [PATCH] netlink: fix compat recvmsg
In reply to Eric DumazetFrom: Eric Dumazet <[email protected]>
Date: Mon, 16 Aug 2010 14:50:25 +0200
Quoted 13 lines · Johannes Berg
Quoted 12 lines
From: Johannes Berg <[email protected]>
Since
commit1dacc76d0014a034b8aca14237c127d7c19d7726Author: Johannes Berg <[email protected]> Date: Wed Jul 1 11:26:02 2009 +0000
net/compat/wext: send different messages to compat taskswe had a race condition when setting and then
restoringfrag_list. Eric attempted to fix it,
but the fix created even worse problems.
...
Quoted 1 line
Quoted 1 line
Signed-off-by Johannes Berg <[email protected]>
...
Quoted 1 line
Acked-by Eric Dumazet <[email protected]>
Applied, thanks guys!