summaryrefslogtreecommitdiffstats
path: root/net/x25
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-09-08 08:42:06 +0100
committerDavid S. Miller <davem@davemloft.net>2016-09-09 18:13:30 -0700
commit05f1b12f71a49848730a0eb9acda032d5c43432b (patch)
treea667c2987e4d089a0e369a9ff65e2c7aa465ba48 /net/x25
parentc24acf03c7352bd10a99e58b0366b2acf8722856 (diff)
downloadlinux-stable-05f1b12f71a49848730a0eb9acda032d5c43432b.tar.gz
linux-stable-05f1b12f71a49848730a0eb9acda032d5c43432b.tar.bz2
linux-stable-05f1b12f71a49848730a0eb9acda032d5c43432b.zip
net: x25: remove null checks on arrays calling_ae and called_ae
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 <colin.king@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
-rw-r--r--net/x25/af_x25.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index a750f330b8dd..f83b74d3e2ac 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: