[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20191125.144522.2288594830565793222.davem@davemloft.net>
Date: Mon, 25 Nov 2019 14:45:22 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: zenczykowski@...il.com
Cc: maze@...gle.com, netdev@...r.kernel.org, edumazet@...gle.com
Subject: Re: [PATCH] net: port < inet_prot_sock(net) -->
inet_port_requires_bind_service(net, port)
From: Maciej Żenczykowski <zenczykowski@...il.com>
Date: Sun, 24 Nov 2019 01:27:15 -0800
> -static inline int inet_prot_sock(struct net *net)
> +static inline bool inet_port_requires_bind_service(struct net *net, int port)
"int port"
> -static inline int inet_prot_sock(struct net *net)
> +static inline bool inet_port_requires_bind_service(struct net *net, int port)
"int port"
> @@ -495,7 +495,7 @@ int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
>
> snum = ntohs(addr->sin_port);
> err = -EACCES;
> - if (snum && snum < inet_prot_sock(net) &&
> + if (snum && inet_port_requires_bind_service(net, snum) &&
"unsigned short snum"
> @@ -292,7 +292,7 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
> return -EINVAL;
>
> snum = ntohs(addr->sin6_port);
> - if (snum && snum < inet_prot_sock(net) &&
> + if (snum && inet_port_requires_bind_service(net, snum) &&
"unsigned short snum"
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index 3be7398901e0..8d14a1acbc37 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -423,7 +423,7 @@ ip_vs_service_find(struct netns_ipvs *ipvs, int af, __u32 fwmark, __u16 protocol
>
> if (!svc && protocol == IPPROTO_TCP &&
> atomic_read(&ipvs->ftpsvc_counter) &&
> - (vport == FTPDATA || ntohs(vport) >= inet_prot_sock(ipvs->net))) {
> + (vport == FTPDATA || !inet_port_requires_bind_service(ipvs->net, ntohs(vport)))) {
ntohs(__be16 vport)
> @@ -384,7 +384,7 @@ static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
> }
> }
>
> - if (snum && snum < inet_prot_sock(net) &&
> + if (snum && inet_port_requires_bind_service(net, snum) &&
"unsigned short snum"
And so on and so forth.
Please make the types in the helper(s) match actual usage, thank you.
Powered by blists - more mailing lists