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>
This commit is contained in:
committed by
Jakub Kicinski
parent
773ba4fe91
commit
1b4b2b09d4
@@ -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 */
|
const u32 byte_limit = 1 << 19; /* limit to a few TSO */
|
||||||
u32 bytelen, next;
|
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),
|
/* realloc only when socket is locked (TCP, UDP cork),
|
||||||
* so uarg->len and sk_zckey access is serialized
|
* so uarg->len and sk_zckey access is serialized
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user