diff options
| author |   Vinicius Costa Gomes <vinicius.gomes@intel.com> | 2018-03-14 13:32:09 -0700 |
|---|---|---|
| committer |   Ben Hutchings <ben@decadent.org.uk> | 2018-06-01 00:30:22 +0100 |
| commit | 916446829c46be4a17a578941551428f841d2a05 (patch) | |
| tree | 8e696e66aab57701728ca807247504036e66ec81 | |
| parent | fs: Teach path_connected to handle nfs filesystems with multiple roots. (diff) | |
| download | linux-stable-916446829c46be4a17a578941551428f841d2a05.tar.xz linux-stable-916446829c46be4a17a578941551428f841d2a05.zip | |
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 <randy.e.witt@intel.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[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 <ben@decadent.org.uk>
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 1 insertions, 3 deletions
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); |