diff mbox

tcp: md5: remove unneeded check in tcp_v4_parse_md5_keys

Message ID 20140803224519.49a40242da5c1cbe61f97753@qrator.net
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Dmitry Popov Aug. 3, 2014, 6:45 p.m. UTC 
tcpm_key is an array inside struct tcp_md5sig, there is no need to check it
against NULL.

Signed-off-by: Dmitry Popov <ixaphire@qrator.net>
---
 net/ipv4/tcp_ipv4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Hideaki Yoshifuji Aug. 4, 2014, 12:05 a.m. UTC | #1 
Dmitry Popov wrote:
> tcpm_key is an array inside struct tcp_md5sig, there is no need to check it
> against NULL.
>
> Signed-off-by: Dmitry Popov <ixaphire@qrator.net>

Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

(IPv6 side is okay.)

> ---
>   net/ipv4/tcp_ipv4.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index 77cccda..8ea4eff 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -1064,7 +1064,7 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, char __user *optval,
>   	if (sin->sin_family != AF_INET)
>   		return -EINVAL;
>
> -	if (!cmd.tcpm_key || !cmd.tcpm_keylen)
> +	if (!cmd.tcpm_keylen)
>   		return tcp_md5_do_del(sk, (union tcp_md5_addr *)&sin->sin_addr.s_addr,
>   				      AF_INET);
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

--yoshfuji
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 77cccda..8ea4eff 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1064,7 +1064,7 @@  static int tcp_v4_parse_md5_keys(struct sock *sk, char __user *optval,
 	if (sin->sin_family != AF_INET)
 		return -EINVAL;
 
-	if (!cmd.tcpm_key || !cmd.tcpm_keylen)
+	if (!cmd.tcpm_keylen)
 		return tcp_md5_do_del(sk, (union tcp_md5_addr *)&sin->sin_addr.s_addr,
 				      AF_INET);