---

yaml --- r: 298787 b: refs/heads/master c: 110c433 h: refs/heads/master i: 298785: 3241084 298783: 4304780 v: v3
git-mirror · Apr 6, 2012 · be3d7ee · be3d7ee
1 parent d079199
commit be3d7ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a7e7c2ad540e54c75489a70137bf0ec15d3a127
+refs/heads/master: 110c43304db6f06490961529536c362d9ac5732f
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -3161,6 +3161,8 @@ 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;
@@ -3175,7 +3177,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, skb->len);
+		sk->sk_data_ready(sk, len);
 	return 0;
 }
 EXPORT_SYMBOL(sock_queue_err_skb);