BACKPORT: net: Make sock protocol value checks more specific
SK_PROTOCOL_MAX is only used in two places, for DECNet and AX.25. The limits have more to do with the those protocol definitions than they do with the data type of sk_protocol, so remove SK_PROTOCOL_MAX and use U8_MAX directly. Reviewed-by: Eric Dumazet <edumazet@google.com> Change-Id: I3d1e12f0cd3ddb2db11a2eaad5e3a1a85c59db06 Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
1 parent
e3f7ea1f73
commit
f46ed8c0cf
2 files changed
+1
-2
No files matched your search
@@ -463,7 +463,6 @@ struct sock {
|
||||
sk_userlocks : 4,
|
||||
sk_protocol : 8,
|
||||
sk_type : 16;
|
||||
#define SK_PROTOCOL_MAX U8_MAX
|
||||
u16 sk_gso_max_segs;
|
||||
u8 sk_pacing_shift;
|
||||
unsigned long sk_lingertime;
|
||||
|
||||
+1
-1
@@ -834,7 +834,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,
|
||||
struct sock *sk;
|
||||
ax25_cb *ax25;
|
||||
|
||||
if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
|
||||
if (protocol < 0 || protocol > U8_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
if (!net_eq(net, &init_net))
|
||||
|
||||
Reference in new issue
Block a user