Commit 1b4b2b09 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jakub Kicinski
Browse files

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: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 773ba4fe

net/core/skbuff.c

+4 −0
Original line number Diff line number Diff line
@@ -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

		 */