lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 21 Dec 2020 16:09:17 -0800 From: Jonathan Lemon <jonathan.lemon@...il.com> To: <netdev@...r.kernel.org>, <edumazet@...gle.com>, <willemdebruijn.kernel@...il.com> CC: <kernel-team@...com> Subject: [PATCH 03/12 v2 RFC] skbuff: simplify sock_zerocopy_put From: Jonathan Lemon <bsd@...com> All 'struct ubuf_info' users should have a callback defined. Remove the dead code path to consume_skb(), which makes unwarranted assumptions about how the structure was allocated. Signed-off-by: Jonathan Lemon <jonathan.lemon@...il.com> --- net/core/skbuff.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 327ee8938f78..ea32b3414ad6 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1245,12 +1245,8 @@ EXPORT_SYMBOL_GPL(sock_zerocopy_callback); void sock_zerocopy_put(struct ubuf_info *uarg) { - if (uarg && refcount_dec_and_test(&uarg->refcnt)) { - if (uarg->callback) - uarg->callback(uarg, uarg->zerocopy); - else - consume_skb(skb_from_uarg(uarg)); - } + if (uarg && refcount_dec_and_test(&uarg->refcnt)) + uarg->callback(uarg, uarg->zerocopy); } EXPORT_SYMBOL_GPL(sock_zerocopy_put); -- 2.24.1
Powered by blists - more mailing lists