projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8d0c469
)
ipv4: warn once on passing AF_INET6 socket to ip_recv_error
author
Willem de Bruijn
<willemb@google.com>
Mon, 1 Dec 2014 03:22:33 +0000
(22:22 -0500)
committer
David S. Miller
<davem@davemloft.net>
Tue, 9 Dec 2014 01:20:48 +0000
(20:20 -0500)
One line change, in response to catching an occurrence of this bug.
See also fix
f4713a3dfad0
("net-timestamp: make tcp_recvmsg call ...")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_sockglue.c
patch
|
blob
|
history
diff --git
a/net/ipv4/ip_sockglue.c
b/net/ipv4/ip_sockglue.c
index
b782657
..
59eba6c
100644
(file)
--- a/
net/ipv4/ip_sockglue.c
+++ b/
net/ipv4/ip_sockglue.c
@@
-414,6
+414,8
@@
int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
int err;
int copied;
+ WARN_ON_ONCE(sk->sk_family == AF_INET6);
+
err = -EAGAIN;
skb = sock_dequeue_err_skb(sk);
if (skb == NULL)