diff options
| author | Willem de Bruijn | 2017-08-10 01:09:44 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-10 01:49:17 +0200 |
| commit | 0a4a060bb204c47825eb4f7c27f66fc7ee85d508 (patch) | |
| tree | 49f558c2efc24570bee03923b0f8c91d9fc4609f /include/linux/skbuff.h | |
| parent | sock: fix zerocopy panic in mem accounting (diff) | |
| download | kernel-qcow2-linux-0a4a060bb204c47825eb4f7c27f66fc7ee85d508.tar.gz kernel-qcow2-linux-0a4a060bb204c47825eb4f7c27f66fc7ee85d508.tar.xz kernel-qcow2-linux-0a4a060bb204c47825eb4f7c27f66fc7ee85d508.zip | |
sock: fix zerocopy_success regression with msg_zerocopy
Do not use uarg->zerocopy outside msg_zerocopy. In other paths the
field is not explicitly initialized and aliases another field.
Those paths have only one reference so do not need this intermediate
variable. Call uarg->callback directly.
Fixes: 1f8b977ab32d ("sock: enable MSG_ZEROCOPY")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 8c0708d2e5e6..7594e19bce62 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1273,8 +1273,13 @@ static inline void skb_zcopy_clear(struct sk_buff *skb, bool zerocopy) struct ubuf_info *uarg = skb_zcopy(skb); if (uarg) { - uarg->zerocopy = uarg->zerocopy && zerocopy; - sock_zerocopy_put(uarg); + if (uarg->callback == sock_zerocopy_callback) { + uarg->zerocopy = uarg->zerocopy && zerocopy; + sock_zerocopy_put(uarg); + } else { + uarg->callback(uarg, zerocopy); + } + skb_shinfo(skb)->tx_flags &= ~SKBTX_ZEROCOPY_FRAG; } } |