diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-13 12:37:06 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-13 12:37:06 +0300 |
| commit | 3c69ea44406bf27b6f2e9b2f11238c344fd8374d (patch) | |
| tree | b459600bfffb55b6693b566f5dff859daa216dbe /net/unix/af_unix.c | |
| parent | 53b3ffee788559fe26d32f21b223bf4bad959477 (diff) | |
| parent | e8d65a8d985271a102f07c7456da5b86c19ffe16 (diff) | |
| download | linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.tar.xz | |
Merge branch 'for-linus' into for-next
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); |