From: Vinicius Costa Gomes Date: Wed, 14 Mar 2018 20:32:09 +0000 (-0700) Subject: skbuff: Fix not waking applications when errors are enqueued X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=916446829c46be4a17a578941551428f841d2a05;hp=0b13359cb718925be0e13eb4713d14434a681fbf skbuff: Fix not waking applications when errors are enqueued commit 6e5d58fdc9bedd0255a8781b258f10bbdc63e975 upstream. When errors are enqueued to the error queue via sock_queue_err_skb() function, it is possible that the waiting application is not notified. Calling 'sk->sk_data_ready()' would not notify applications that selected only POLLERR events in poll() (for example). Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: Randy E. Witt Reviewed-by: Eric Dumazet Signed-off-by: Vinicius Costa Gomes Signed-off-by: David S. Miller [bwh: Backported to 3.2: sk_data_ready() operation takes a length parameter. Delete the local variable we used for that.] Signed-off-by: Ben Hutchings --- diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 847b314b3a70..c5337c25d32d 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3093,8 +3093,6 @@ static void sock_rmem_free(struct sk_buff *skb) */ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb) { - int len = skb->len; - if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >= (unsigned)sk->sk_rcvbuf) return -ENOMEM; @@ -3109,7 +3107,7 @@ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb) skb_queue_tail(&sk->sk_error_queue, skb); if (!sock_flag(sk, SOCK_DEAD)) - sk->sk_data_ready(sk, len); + sk->sk_error_report(sk); return 0; } EXPORT_SYMBOL(sock_queue_err_skb);