diff options
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 15 | 
1 files changed, 14 insertions, 1 deletions
| diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 03ee4d359f6a..ef31b40ad550 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2179,8 +2179,21 @@ unlock:  			if (UNIXCB(skb).fp)  				scm.fp = scm_fp_dup(UNIXCB(skb).fp); -			sk_peek_offset_fwd(sk, chunk); +			if (skip) { +				sk_peek_offset_fwd(sk, chunk); +				skip -= chunk; +			} +			if (UNIXCB(skb).fp) +				break; + +			last = skb; +			last_len = skb->len; +			unix_state_lock(sk); +			skb = skb_peek_next(skb, &sk->sk_receive_queue); +			if (skb) +				goto again; +			unix_state_unlock(sk);  			break;  		}  	} while (size); |