Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbbd7d4f authored by Paul Moore's avatar Paul Moore Committed by David S. Miller
Browse files

[INET]: Fix incorrect "inet_sock->is_icsk" assignment. 



The inet_create() and inet6_create() functions incorrectly set the
inet_sock->is_icsk field.  Both functions assume that the is_icsk field is
large enough to hold at least a INET_PROTOSW_ICSK value when it is actually
only a single bit.  This patch corrects the assignment by doing a boolean
comparison whose result will safely fit into a single bit field.

Signed-off-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efa06708

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int inet_create(struct socket *sock, int protocol) 
		sk->sk_reuse = 1;



	inet = inet_sk(sk);

	inet->is_icsk = INET_PROTOSW_ICSK & answer_flags;

	inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) == INET_PROTOSW_ICSK;



	if (SOCK_RAW == sock->type) {

		inet->num = protocol;

net/ipv6/af_inet6.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int inet6_create(struct socket *sock, int protocol) 
		sk->sk_reuse = 1;



	inet = inet_sk(sk);

	inet->is_icsk = INET_PROTOSW_ICSK & answer_flags;

	inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) == INET_PROTOSW_ICSK;



	if (SOCK_RAW == sock->type) {

		inet->num = protocol;