From: Vasily Averin <vvs@virtuozzo.com>
To: "David S. Miller" <davem@davemloft.net>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
David Ahern <dsahern@kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <eric.dumazet@gmail.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH IPV6 v3 1/1] ipv6: allocate enough headroom in ip6_finish_output2()
Date: Tue, 13 Jul 2021 10:46:14 +0300 [thread overview]
Message-ID: <e44bfeb9-5a5a-9f44-12bd-ec3d61eb3a14@virtuozzo.com> (raw)
In-Reply-To: <1b1efd52-dd34-2023-021c-c6c6df6fec5f@virtuozzo.com>
I've found 2 problems in this patch,
and I'm going to resend new patch version soon.
On 7/12/21 9:45 AM, Vasily Averin wrote:
> index ff4f9eb..0efcb9b 100644
> --- a/net/ipv6/ip6_output.c
> +++ b/net/ipv6/ip6_output.c
> @@ -60,10 +60,38 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *
> {
> struct dst_entry *dst = skb_dst(skb);
> struct net_device *dev = dst->dev;
> + unsigned int hh_len = LL_RESERVED_SPACE(dev);
> + int delta = hh_len - skb_headroom(skb);
> const struct in6_addr *nexthop;
> struct neighbour *neigh;
> int ret;
>
> + /* Be paranoid, rather than too clever. */
> + if (unlikely(delta > 0) && dev->header_ops) {
> + /* pskb_expand_head() might crash, if skb is shared */
> + if (skb_shared(skb)) {
> + struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
> +
> + if (likely(nskb)) {
> + if (skb->sk)
> + skb_set_owner_w(skb, skb->sk);
need to assign sk not to skb but to nskb
> + consume_skb(skb);
> + } else {
> + kfree_skb(skb);
It is quite strange to call consume_skb() on one case and kfree_skb() in another one.
We know that original skb was shared so we should not call kfree_skb here.
Btw I've noticed similar problem in few other cases:
in pptp_xmit, pvc_xmit, ip_vs_prepare_tunneled_skb
they call consume_skb() in case of success and kfree_skb on error path.
It looks like potential bug for me.
> + }
> + skb = nskb;
> + }
> + if (skb &&
> + pskb_expand_head(skb, SKB_DATA_ALIGN(delta), 0, GFP_ATOMIC)) {
> + kfree_skb(skb);
> + skb = NULL;
> + }
> + if (!skb) {
> + IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTDISCARDS);
> + return -ENOMEM;
> + }
> + }
> +
> if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
> struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
>
>
next prev parent reply other threads:[~2021-07-13 7:46 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1625665132.git.vvs@virtuozzo.com>
2021-07-07 14:04 ` [PATCH IPV6 1/1] ipv6: allocate enough headroom in ip6_finish_output2() Vasily Averin
2021-07-07 14:45 ` David Ahern
2021-07-07 16:42 ` Jakub Kicinski
2021-07-07 17:41 ` Eric Dumazet
2021-07-07 17:53 ` Vasily Averin
2021-07-07 18:30 ` Jakub Kicinski
2021-07-07 18:50 ` Eric Dumazet
2021-07-09 9:04 ` [PATCH IPV6 v2 0/4] " Vasily Averin
2021-07-12 6:44 ` [PATCH IPV6 v3 0/1] " Vasily Averin
[not found] ` <cover.1626069562.git.vvs@virtuozzo.com>
2021-07-12 6:45 ` [PATCH IPV6 v3 1/1] " Vasily Averin
2021-07-12 18:30 ` patchwork-bot+netdevbpf
2021-07-13 7:46 ` Vasily Averin [this message]
2021-07-13 12:01 ` [PATCH NET v4 0/1] " Vasily Averin
[not found] ` <cover.1626177047.git.vvs@virtuozzo.com>
2021-07-13 12:01 ` [PATCH NET v4 1/1] " Vasily Averin
2021-07-18 10:44 ` Vasily Averin
2021-07-18 15:22 ` David Ahern
2021-07-18 17:04 ` David Miller
2021-07-19 7:55 ` [PATCH NET] ipv6: ip6_finish_output2: set sk into newly allocated nskb Vasily Averin
2021-07-20 10:10 ` patchwork-bot+netdevbpf
2021-07-13 12:31 ` [PATCH IPV6 v3 1/1] ipv6: allocate enough headroom in ip6_finish_output2() Vasily Averin
2021-07-12 13:26 ` [PATCH NET 0/7] skbuff: introduce pskb_realloc_headroom() Vasily Averin
[not found] ` <cover.1626093470.git.vvs@virtuozzo.com>
2021-07-12 13:26 ` [PATCH NET 1/7] " Vasily Averin
2021-07-12 17:53 ` Jakub Kicinski
2021-07-12 18:45 ` Vasily Averin
2021-07-13 20:57 ` [PATCH NET v2 0/7] skbuff: introduce skb_expand_head() Vasily Averin
2021-08-02 8:52 ` [PATCH NET v3 " Vasily Averin
[not found] ` <cover.1627891754.git.vvs@virtuozzo.com>
2021-08-02 8:52 ` [PATCH NET v3 1/7] " Vasily Averin
2021-08-02 8:52 ` [PATCH NET v3 2/7] ipv6: use skb_expand_head in ip6_finish_output2 Vasily Averin
2021-08-02 8:52 ` [PATCH NET v3 3/7] ipv6: use skb_expand_head in ip6_xmit Vasily Averin
2021-08-02 8:52 ` [PATCH NET v3 4/7] ipv4: use skb_expand_head in ip_finish_output2 Vasily Averin
2021-08-02 8:52 ` [PATCH NET v3 5/7] vrf: use skb_expand_head in vrf_finish_output Vasily Averin
2021-08-05 11:55 ` Julian Wiedmann
2021-08-05 12:55 ` Vasily Averin
2021-08-06 7:49 ` [PATCH NET v4 0/7] skbuff: introduce skb_expand_head() Vasily Averin
2021-08-06 10:14 ` David Miller
2021-08-06 12:53 ` [PATCH NET] vrf: fix null pointer dereference in vrf_finish_output() Vasily Averin
2021-08-06 22:42 ` Jakub Kicinski
2021-08-07 6:41 ` Vasily Averin
[not found] ` <cover.1628235065.git.vvs@virtuozzo.com>
2021-08-06 7:49 ` [PATCH NET v4 1/7] skbuff: introduce skb_expand_head() Vasily Averin
2021-08-06 7:50 ` [PATCH NET v4 2/7] ipv6: use skb_expand_head in ip6_finish_output2 Vasily Averin
2021-08-06 7:50 ` [PATCH NET v4 3/7] ipv6: use skb_expand_head in ip6_xmit Vasily Averin
[not found] ` <CALMXkpaay1y=0tkbnskr4gf-HTMjJJsVryh4Prnej_ws-hJvBg@mail.gmail.com>
2021-08-20 22:44 ` Christoph Paasch
2021-08-21 6:21 ` Vasily Averin
2021-08-22 17:04 ` Christoph Paasch
2021-08-22 17:13 ` Christoph Paasch
2021-08-23 5:44 ` Vasily Averin
2021-08-23 5:59 ` Vasily Averin
2021-08-23 7:56 ` [PATCH NET-NEXT] ipv6: skb_expand_head() adjust skb->truesize incorrectly Vasily Averin
2021-08-23 17:25 ` Christoph Paasch
2021-08-23 21:45 ` Eric Dumazet
2021-08-23 21:51 ` Eric Dumazet
2021-08-23 22:23 ` Eric Dumazet
2021-08-24 8:50 ` Vasily Averin
2021-08-24 17:21 ` Vasily Averin
2021-08-25 17:49 ` Christoph Paasch
2021-08-29 12:59 ` [PATCH v2] " Vasily Averin
2021-08-30 5:52 ` [PATCH net-next " Vasily Averin
2021-08-30 16:01 ` [PATCH " Eric Dumazet
2021-08-30 18:09 ` Vasily Averin
2021-08-30 18:37 ` Vasily Averin
2021-08-30 19:58 ` Eric Dumazet
2021-08-31 14:34 ` [PATCH net-next v3 RFC] " Vasily Averin
2021-08-31 19:38 ` Eric Dumazet
2021-09-01 6:20 ` Vasily Averin
2021-09-01 8:11 ` [PATCH net-next v4] " Vasily Averin
2021-09-01 16:58 ` Christoph Paasch
2021-09-01 19:17 ` Eric Dumazet
2021-09-02 3:59 ` Vasily Averin
2021-09-02 4:32 ` Eric Dumazet
2021-09-02 4:48 ` Eric Dumazet
2021-09-02 7:13 ` Vasily Averin
2021-09-02 7:33 ` Vasily Averin
2021-09-02 8:31 ` Vasily Averin
2021-09-02 11:12 ` [PATCH net-next v5] " Vasily Averin
2021-09-02 15:53 ` Christoph Paasch
2021-09-02 16:32 ` Vasily Averin
2021-09-06 18:01 ` [PATCH net v6] " Vasily Averin
2021-09-06 18:03 ` Vasily Averin
2021-08-27 15:23 ` [PATCH NET-NEXT] ipv6: " Vasily Averin
2021-08-27 16:47 ` Eric Dumazet
2021-08-28 8:01 ` Vasily Averin
2021-08-06 7:50 ` [PATCH NET v4 4/7] ipv4: use skb_expand_head in ip_finish_output2 Vasily Averin
2021-08-06 7:50 ` [PATCH NET v4 5/7] vrf: use skb_expand_head in vrf_finish_output Vasily Averin
2021-08-06 7:50 ` [PATCH NET v4 6/7] ax25: use skb_expand_head Vasily Averin
2021-08-06 7:50 ` [PATCH NET v4 7/7] bpf: use skb_expand_head in bpf_out_neigh_v4/6 Vasily Averin
2021-08-02 8:52 ` [PATCH NET v3 6/7] ax25: use skb_expand_head Vasily Averin
2021-08-02 8:52 ` [PATCH NET v3 7/7] bpf: use skb_expand_head in bpf_out_neigh_v4/6 Vasily Averin
[not found] ` <cover.1626206993.git.vvs@virtuozzo.com>
2021-07-13 20:57 ` [PATCH NET v2 1/7] skbuff: introduce skb_expand_head() Vasily Averin
2021-07-13 20:58 ` [PATCH NET v2 2/7] ipv6: use skb_expand_head in ip6_finish_output2 Vasily Averin
2021-07-13 20:58 ` [PATCH NET v2 3/7] ipv6: use skb_expand_head in ip6_xmit Vasily Averin
2021-07-13 20:58 ` [PATCH NET v2 4/7] ipv4: use skb_expand_head in ip_finish_output2 Vasily Averin
2021-07-13 20:58 ` [PATCH NET v2 5/7] vrf: use skb_expand_head in vrf_finish_output Vasily Averin
2021-07-13 20:58 ` [PATCH NET v2 6/7] ax25: use skb_expand_head Vasily Averin
2021-07-13 20:58 ` [PATCH NET v2 7/7] bpf: use skb_expand_head in bpf_out_neigh_v4/6 Vasily Averin
2021-07-12 13:26 ` [PATCH NET 2/7] ipv6: use pskb_realloc_headroom in ip6_finish_output2 Vasily Averin
2021-07-12 13:26 ` [PATCH NET 3/7] ipv6: use pskb_realloc_headroom in ip6_xmit refactoring Vasily Averin
2021-07-12 13:27 ` [PATCH NET 4/7] ipv4: use pskb_realloc_headroom in ip_finish_output2 Vasily Averin
2021-07-12 13:27 ` [PATCH NET 5/7] vrf: use pskb_realloc_headroom in vrf_finish_output Vasily Averin
2021-07-12 13:27 ` [PATCH NET 6/7] ax25: use pskb_realloc_headroom Vasily Averin
2021-07-12 13:27 ` [PATCH NET 7/7] bpf: use pskb_realloc_headroom in bpf_out_neigh_v4/6 Vasily Averin
[not found] ` <cover.1625818825.git.vvs@virtuozzo.com>
2021-07-09 9:04 ` [PATCH IPV6 v2 1/4] ipv6: allocate enough headroom in ip6_finish_output2() Vasily Averin
2021-07-09 17:58 ` David Miller
2021-07-10 2:53 ` Vasily Averin
2021-07-09 9:04 ` [PATCH IPV6 v2 2/4] ipv6: use new helper skb_expand_head() in ip6_xmit() Vasily Averin
2021-07-09 9:05 ` [PATCH IPV6 v2 3/4] ipv6: ip6_finish_output2 refactoring Vasily Averin
2021-07-09 9:05 ` [PATCH IPV6 v2 4/4] ipv6: ip6_xmit refactoring Vasily Averin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e44bfeb9-5a5a-9f44-12bd-ec3d61eb3a14@virtuozzo.com \
--to=vvs@virtuozzo.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=eric.dumazet@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).