lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 7 Aug 2022 21:31:13 -0400 From: Sasha Levin <sashal@...nel.org> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org Cc: Pavel Begunkov <asml.silence@...il.com>, Jakub Kicinski <kuba@...nel.org>, Sasha Levin <sashal@...nel.org>, davem@...emloft.net, edumazet@...gle.com, pabeni@...hat.com, imagedong@...cent.com, luiz.von.dentz@...el.com, vasily.averin@...ux.dev, jk@...econstruct.com.au, netdev@...r.kernel.org Subject: [PATCH AUTOSEL 5.19 55/58] skbuff: don't mix ubuf_info from different sources From: Pavel Begunkov <asml.silence@...il.com> [ Upstream commit 1b4b2b09d4fb451029b112f17d34792e0277aeb2 ] 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@...il.com> Signed-off-by: Jakub Kicinski <kuba@...nel.org> Signed-off-by: Sasha Levin <sashal@...nel.org> --- net/core/skbuff.c | 4 ++++ 1 file changed, 4 insertions(+) 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 */ -- 2.35.1
Powered by blists - more mailing lists