net: Make sock protocol value checks more specific (e9cdced7) · Commits · 戴 / test

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> Signed-off-by:

Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

include/net/sock.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -458,7 +458,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;

net/ax25/af_ax25.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -808,7 +808,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))

net/decnet/af_decnet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -670,7 +670,7 @@ static int dn_create(struct net net, struct socket sock, int protocol,
		{
		struct sock *sk;

		if (protocol < 0 \|\| protocol > SK_PROTOCOL_MAX)
		if (protocol < 0 \|\| protocol > U8_MAX)
		return -EINVAL;

		if (!net_eq(net, &init_net))

Admin message