Skip to content

Commit

Permalink
llc: Don't drop packet from non-root netns.
Browse files Browse the repository at this point in the history
[ Upstream commit 6631463b6e6673916d2481f692938f393148aa82 ]

Now these upper layer protocol handlers can be called from llc_rcv()
as sap->rcv_func(), which is registered by llc_sap_open().

  * function which is passed to register_8022_client()
    -> no in-kernel user calls register_8022_client().

  * snap_rcv()
    `- proto->rcvfunc() : registered by register_snap_client()
       -> aarp_rcv() and atalk_rcv() drop packets from non-root netns

  * stp_pdu_rcv()
    `- garp_protos[]->rcv() : registered by stp_proto_register()
       -> garp_pdu_rcv() and br_stp_rcv() are netns-aware

So, we can safely remove the netns restriction in llc_rcv().

Fixes: e730c15 ("[NET]: Make packet reception network namespace safe")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
q2ven authored and gregkh committed Aug 11, 2023
1 parent 9386ddd commit e03426f
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions net/llc/llc_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,6 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
void (*sta_handler)(struct sk_buff *skb);
void (*sap_handler)(struct llc_sap *sap, struct sk_buff *skb);

if (!net_eq(dev_net(dev), &init_net))
goto drop;

/*
* When the interface is in promisc. mode, drop all the crap that it
* receives, do not try to analyse it.
Expand Down

0 comments on commit e03426f

Please sign in to comment.