Commit e9cdced7 authored by Mat Martineau's avatar Mat Martineau Committed by David S. Miller

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b3acfc3
...@@ -458,7 +458,6 @@ struct sock { ...@@ -458,7 +458,6 @@ struct sock {
sk_userlocks : 4, sk_userlocks : 4,
sk_protocol : 8, sk_protocol : 8,
sk_type : 16; sk_type : 16;
#define SK_PROTOCOL_MAX U8_MAX
u16 sk_gso_max_segs; u16 sk_gso_max_segs;
u8 sk_pacing_shift; u8 sk_pacing_shift;
unsigned long sk_lingertime; unsigned long sk_lingertime;
......
...@@ -808,7 +808,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol, ...@@ -808,7 +808,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,
struct sock *sk; struct sock *sk;
ax25_cb *ax25; ax25_cb *ax25;
if (protocol < 0 || protocol > SK_PROTOCOL_MAX) if (protocol < 0 || protocol > U8_MAX)
return -EINVAL; return -EINVAL;
if (!net_eq(net, &init_net)) if (!net_eq(net, &init_net))
......
...@@ -670,7 +670,7 @@ static int dn_create(struct net *net, struct socket *sock, int protocol, ...@@ -670,7 +670,7 @@ static int dn_create(struct net *net, struct socket *sock, int protocol,
{ {
struct sock *sk; struct sock *sk;
if (protocol < 0 || protocol > SK_PROTOCOL_MAX) if (protocol < 0 || protocol > U8_MAX)
return -EINVAL; return -EINVAL;
if (!net_eq(net, &init_net)) if (!net_eq(net, &init_net))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment