diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2022-07-12 21:52:27 +0100 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2022-07-18 19:58:45 -0700 |
| commit | 1b4b2b09d4fb451029b112f17d34792e0277aeb2 (patch) | |
| tree | afff75e943b7ded29be8ec36d4f0006f8c354238 /net/core/skbuff.c | |
| parent | ipv6: avoid partial copy for zc (diff) | |
| download | linux-dev-1b4b2b09d4fb451029b112f17d34792e0277aeb2.tar.xz linux-dev-1b4b2b09d4fb451029b112f17d34792e0277aeb2.zip | |
skbuff: don't mix ubuf_info from different sources
We should not append MSG_ZEROCOPY requests to skbuff with non
MSG_ZEROCOPY ubuf_info, they might be not compatible.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 5b3559cb1d82..09f56bfa2771 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1212,6 +1212,10 @@ struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size, const u32 byte_limit = 1 << 19; /* limit to a few TSO */ u32 bytelen, next; + /* there might be non MSG_ZEROCOPY users */ + if (uarg->callback != msg_zerocopy_callback) + return NULL; + /* realloc only when socket is locked (TCP, UDP cork), * so uarg->len and sk_zckey access is serialized */ |