From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org, mptcp@lists.01.org
Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next v5 01/11] net: Make sock protocol value checks more specific
Date: Thu, 19 Dec 2019 14:34:24 -0800 [thread overview]
Message-ID: <20191219223434.19722-2-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20191219223434.19722-1-mathew.j.martineau@linux.intel.com>
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.
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
include/net/sock.h | 1 -
net/ax25/af_ax25.c | 2 +-
net/decnet/af_decnet.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 87d54ef57f00..81dc811aad2e 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -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;
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 324306d6fde0..ff57ea89c27e 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -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))
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index e19a92a62e14..0a46ea3bddd5 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -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))
--
2.24.1
next prev parent reply other threads:[~2019-12-19 22:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 22:34 [PATCH net-next v5 00/11] Multipath TCP: Prerequisites Mat Martineau
2019-12-19 22:34 ` Mat Martineau [this message]
2019-12-20 15:35 ` [PATCH net-next v5 01/11] net: Make sock protocol value checks more specific Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau
2019-12-20 15:37 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau
2019-12-20 15:39 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 04/11] tcp: Add MPTCP option number Mat Martineau
2019-12-20 15:39 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau
2019-12-20 15:26 ` Eric Dumazet
2019-12-20 16:21 ` Paolo Abeni
2019-12-20 16:26 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau
2019-12-20 15:33 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 07/11] tcp: coalesce/collapse must respect MPTCP extensions Mat Martineau
2019-12-20 15:25 ` Eric Dumazet
2019-12-20 16:17 ` Mat Martineau
2019-12-19 22:34 ` [PATCH net-next v5 08/11] tcp: Export TCP functions and ops struct Mat Martineau
2019-12-20 15:31 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau
2019-12-20 15:27 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 10/11] tcp: clean ext on tx recycle Mat Martineau
2019-12-20 15:29 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191219223434.19722-2-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).