[PATCH] net: x25: remove null checks on arrays calling_ae and called_ae

Subsystems: networking [general], the rest, x.25 stack

STALE3688d

2 messages, 2 authors, 2016-09-10 · open the first message on its own page

[PATCH] net: x25: remove null checks on arrays calling_ae and called_ae

From: Colin King <hidden>
Date: 2016-09-08 07:43:36

From: Colin Ian King <redacted>

dtefacs.calling_ae and called_ae are both 20 element __u8 arrays and
cannot be null and hence are redundant checks. Remove these.

Signed-off-by: Colin Ian King <redacted>
---
 net/x25/af_x25.c | 4 ----
 1 file changed, 4 deletions(-)
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index a750f33..f83b74d 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1500,12 +1500,8 @@ out_fac_release:
 			goto out_dtefac_release;
 		if (dtefacs.calling_len > X25_MAX_AE_LEN)
 			goto out_dtefac_release;
-		if (dtefacs.calling_ae == NULL)
-			goto out_dtefac_release;
 		if (dtefacs.called_len > X25_MAX_AE_LEN)
 			goto out_dtefac_release;
-		if (dtefacs.called_ae == NULL)
-			goto out_dtefac_release;
 		x25->dte_facilities = dtefacs;
 		rc = 0;
 out_dtefac_release:
-- 
2.9.3

Re: [PATCH] net: x25: remove null checks on arrays calling_ae and called_ae

From: David Miller <davem@davemloft.net>
Date: 2016-09-10 01:15:42

From: Colin King <redacted>
Date: Thu,  8 Sep 2016 08:42:06 +0100
From: Colin Ian King <redacted>

dtefacs.calling_ae and called_ae are both 20 element __u8 arrays and
cannot be null and hence are redundant checks. Remove these.

Signed-off-by: Colin Ian King <redacted>
Indeed, and if they were pointers they would be in userspace and would
need proper uaccess handling.

Applied to net-next, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help