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 linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20210213141021.87840-6-alobakin@pm.me> Date: Sat, 13 Feb 2021 14:11:50 +0000 From: Alexander Lobakin <alobakin@...me> To: "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org> Cc: Jonathan Lemon <jonathan.lemon@...il.com>, Eric Dumazet <edumazet@...gle.com>, Dmitry Vyukov <dvyukov@...gle.com>, Willem de Bruijn <willemb@...gle.com>, Alexander Lobakin <alobakin@...me>, Randy Dunlap <rdunlap@...radead.org>, Kevin Hao <haokexin@...il.com>, Pablo Neira Ayuso <pablo@...filter.org>, Jakub Sitnicki <jakub@...udflare.com>, Marco Elver <elver@...gle.com>, Dexuan Cui <decui@...rosoft.com>, Paolo Abeni <pabeni@...hat.com>, Jesper Dangaard Brouer <brouer@...hat.com>, Alexander Duyck <alexanderduyck@...com>, Alexander Duyck <alexander.duyck@...il.com>, Alexei Starovoitov <ast@...nel.org>, Daniel Borkmann <daniel@...earbox.net>, Andrii Nakryiko <andriin@...com>, Taehee Yoo <ap420073@...il.com>, Wei Wang <weiwan@...gle.com>, Cong Wang <xiyou.wangcong@...il.com>, Björn Töpel <bjorn@...nel.org>, Miaohe Lin <linmiaohe@...wei.com>, Guillaume Nault <gnault@...hat.com>, Florian Westphal <fw@...len.de>, Edward Cree <ecree.xilinx@...il.com>, linux-kernel@...r.kernel.org, netdev@...r.kernel.org Subject: [PATCH v6 net-next 05/11] skbuff: use __build_skb_around() in __alloc_skb() Just call __build_skb_around() instead of open-coding it. Signed-off-by: Alexander Lobakin <alobakin@...me> --- net/core/skbuff.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 88566de26cd1..1c6f6ef70339 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -326,7 +326,6 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, int flags, int node) { struct kmem_cache *cache; - struct skb_shared_info *shinfo; struct sk_buff *skb; u8 *data; bool pfmemalloc; @@ -366,21 +365,8 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, * the tail pointer in struct sk_buff! */ memset(skb, 0, offsetof(struct sk_buff, tail)); - /* Account for allocated memory : skb + skb->head */ - skb->truesize = SKB_TRUESIZE(size); + __build_skb_around(skb, data, 0); skb->pfmemalloc = pfmemalloc; - refcount_set(&skb->users, 1); - skb->head = data; - skb->data = data; - skb_reset_tail_pointer(skb); - skb->end = skb->tail + size; - skb->mac_header = (typeof(skb->mac_header))~0U; - skb->transport_header = (typeof(skb->transport_header))~0U; - - /* make sure we initialize shinfo sequentially */ - shinfo = skb_shinfo(skb); - memset(shinfo, 0, offsetof(struct skb_shared_info, dataref)); - atomic_set(&shinfo->dataref, 1); if (flags & SKB_ALLOC_FCLONE) { struct sk_buff_fclones *fclones; @@ -393,8 +379,6 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, fclones->skb2.fclone = SKB_FCLONE_CLONE; } - skb_set_kcov_handle(skb, kcov_common_handle()); - return skb; nodata: -- 2.30.1
Powered by blists - more mailing lists