From: Pavel Begunkov <asml.silence@gmail.com>
Date: Tue, 12 Jul 2022 20:52:27 +0000 (+0100)
Subject: skbuff: don't mix ubuf_info from different sources
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1b4b2b09d4fb451029b112f17d34792e0277aeb2;p=linux.git

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>
---

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5b3559cb1d827..09f56bfa2771e 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
 		 */