leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: better drop monitoring in ip{6}_recv_error()

Browse Source 
We should call consume_skb(skb) when skb is properly consumed,
or kfree_skb(skb) when skb must be dropped in error case.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2016-04-21 22:27:32 -07:00 committed by David S. Miller
parent 0aea76d35c
commit 960a26282f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv4/ip_sockglue.c
View File

@ -510,9 +510,10 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
copied = len; copied = len;
} }
err = skb_copy_datagram_msg(skb, 0, msg, copied); err = skb_copy_datagram_msg(skb, 0, msg, copied);
if (err) if (unlikely(err)) {
goto out_free_skb; kfree_skb(skb);
return err;
}
sock_recv_timestamp(msg, sk, skb); sock_recv_timestamp(msg, sk, skb);
serr = SKB_EXT_ERR(skb); serr = SKB_EXT_ERR(skb);
@ -544,8 +545,7 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
msg->msg_flags |= MSG_ERRQUEUE; msg->msg_flags |= MSG_ERRQUEUE;
err = copied; err = copied;
out_free_skb: consume_skb(skb);
kfree_skb(skb);
out: out:
return err; return err;
} }

10
net/ipv6/datagram.c
View File

@ -450,9 +450,10 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
copied = len; copied = len;
} }
err = skb_copy_datagram_msg(skb, 0, msg, copied); err = skb_copy_datagram_msg(skb, 0, msg, copied);
if (err) if (unlikely(err)) {
goto out_free_skb; kfree_skb(skb);
return err;
}
sock_recv_timestamp(msg, sk, skb); sock_recv_timestamp(msg, sk, skb);
serr = SKB_EXT_ERR(skb); serr = SKB_EXT_ERR(skb);
@ -509,8 +510,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
msg->msg_flags |= MSG_ERRQUEUE; msg->msg_flags |= MSG_ERRQUEUE;
err = copied; err = copied;
out_free_skb: consume_skb(skb);
kfree_skb(skb);
out: out:
return err; return err;
} }