2020-01-03 09:29:48

by Xu Wang

Subject: [PATCH] l2tp: Remove redundant BUG_ON() check in l2tp_pernet

Passing NULL to l2tp_pernet causes a crash via BUG_ON.
Dereferencing net in net_generic() also has the same effect.
This patch removes the redundant BUG_ON check on the same parameter.

Signed-off-by: Xu Wang <[email protected]>
---
net/l2tp/l2tp_core.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index f82ea12..c99223c 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -122,8 +122,6 @@ static inline struct l2tp_tunnel *l2tp_tunnel(struct sock *sk)

static inline struct l2tp_net *l2tp_pernet(const struct net *net)
{
- BUG_ON(!net);
-
return net_generic(net, l2tp_net_id);
}

--
2.7.4

2020-01-03 20:28:57

by David Miller

Subject: Re: [PATCH] l2tp: Remove redundant BUG_ON() check in l2tp_pernet

From: Xu Wang <[email protected]>
Date: Fri, 3 Jan 2020 09:28:16 +0000

> Passing NULL to l2tp_pernet causes a crash via BUG_ON.
> Dereferencing net in net_generic() also has the same effect.
> This patch removes the redundant BUG_ON check on the same parameter.
>
> Signed-off-by: Xu Wang <[email protected]>

Applied.