From: David S. Miller Date: Fri, 12 Sep 2014 21:51:32 +0000 (-0400) Subject: Merge branch 'sock_queue_err_skb' X-Git-Tag: v3.18-rc1~52^2~95 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5306726bc619be21303c55e09aac317072b3c25;p=karo-tx-linux.git Merge branch 'sock_queue_err_skb' Alexander Duyck says: ==================== Address reference counting issues with sock_queue_err_skb After looking over the code for skb_clone_sk after some comments made by Eric Dumazet I have come to the conclusion that skb_clone_sk is taking the correct approach in how to handle the sk_refcnt when creating a buffer that is eventually meant to be returned to the socket via the sock_queue_err_skb function. However upon review of other callers I found what I believe to be a possible reference count issue in the path for handling "wifi ack" packets. To address this I have applied the same logic that is currently in place so that the sk_refcnt will be forced to stay at least 1, or we will not provide an skb to return in the sk_error_queue. ==================== Signed-off-by: David S. Miller --- c5306726bc619be21303c55e09aac317072b3c25