Received-SPF: pass (google.com: domain of linux-kernel+bounces-19251-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240108085232.95437-1-ptikhomirov@virtuozzo.com>
In-Reply-To: <20240108085232.95437-1-ptikhomirov@virtuozzo.com>
From: Eric Dumazet <edumazet@google.com>
Date: Mon, 8 Jan 2024 10:10:22 +0100
Message-ID: <CANn89iJv1RjbKrX2wbJKepg24a4t46kwuFV_fRYHpsPHJfi+KA@mail.gmail.com>
Subject: Re: [PATCH] neighbour: purge nf_bridged skb from foreign device neigh
To: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Cc: "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, 
	Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, 
	kernel@openvz.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 8, 2024 at 9:52=E2=80=AFAM Pavel Tikhomirov
<ptikhomirov@virtuozzo.com> wrote:
>
> An skb can be added to a neigh->arp_queue while waiting for an arp
> reply. Where original skb's skb->dev can be different to neigh's
> neigh->dev. For instance in case of bridging dnated skb from one veth to
> another, the skb would be added to a neigh->arp_queue of the bridge.
>
> There is no explicit mechanism that prevents the original skb->dev link
> of such skb from being freed under us. For instance neigh_flush_dev does
> not cleanup skbs from different device's neigh queue. But that original
> link can be used and lead to crash on e.g. this stack:
>
> arp_process
>   neigh_update
>     skb =3D __skb_dequeue(&neigh->arp_queue)
>       neigh_resolve_output(..., skb)
>         ...
>           br_nf_dev_xmit
>             br_nf_pre_routing_finish_bridge_slow
>               skb->dev =3D nf_bridge->physindev
>               br_handle_frame_finish
>
> So let's improve neigh_flush_dev to also purge skbs when device
> equal to their skb->nf_bridge->physindev gets destroyed.
>
> Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
> ---
> I'm not fully sure, but likely it is:
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> ---
>  net/core/neighbour.c | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
>
> diff --git a/net/core/neighbour.c b/net/core/neighbour.c
> index 552719c3bbc3d..47d2d52f17da3 100644
> --- a/net/core/neighbour.c
> +++ b/net/core/neighbour.c
> @@ -39,6 +39,9 @@
>  #include <linux/inetdevice.h>
>  #include <net/addrconf.h>
>
> +#include <linux/skbuff.h>
> +#include <linux/netfilter_bridge.h>
> +
>  #include <trace/events/neigh.h>
>
>  #define NEIGH_DEBUG 1
> @@ -377,6 +380,28 @@ static void pneigh_queue_purge(struct sk_buff_head *=
list, struct net *net,
>         }
>  }
>
> +static void neigh_purge_nf_bridge_dev(struct neighbour *neigh, struct ne=
t_device *dev)
> +{
> +       struct sk_buff_head *list =3D &neigh->arp_queue;
> +       struct nf_bridge_info *nf_bridge;
> +       struct sk_buff *skb, *next;
> +
> +       write_lock(&neigh->lock);
> +       skb =3D skb_peek(list);
> +       while (skb) {
> +               nf_bridge =3D nf_bridge_info_get(skb);

This depends on CONFIG_BRIDGE_NETFILTER

Can we solve this issue without adding another layer violation ?

> +
> +               next =3D skb_peek_next(skb, list);
> +               if (nf_bridge && nf_bridge->physindev =3D=3D dev) {
> +                       __skb_unlink(skb, list);
> +                       neigh->arp_queue_len_bytes -=3D skb->truesize;
> +                       kfree_skb(skb);
> +               }
> +               skb =3D next;
> +       }
> +       write_unlock(&neigh->lock);
> +}
> +
>  static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *=
dev,
>                             bool skip_perm)
>  {
> @@ -393,6 +418,7 @@ static void neigh_flush_dev(struct neigh_table *tbl, =
struct net_device *dev,
>                 while ((n =3D rcu_dereference_protected(*np,
>                                         lockdep_is_held(&tbl->lock))) !=
=3D NULL) {
>                         if (dev && n->dev !=3D dev) {
> +                               neigh_purge_nf_bridge_dev(n, dev);
>                                 np =3D &n->next;
>                                 continue;
>                         }
> --
> 2.43.0
>