From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E52AC25B0E for ; Mon, 8 Aug 2022 01:52:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243348AbiHHBwi (ORCPT ); Sun, 7 Aug 2022 21:52:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243222AbiHHBu3 (ORCPT ); Sun, 7 Aug 2022 21:50:29 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50765DFDF; Sun, 7 Aug 2022 18:37:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 2FAEBCE0F8E; Mon, 8 Aug 2022 01:37:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A3E9C4347C; Mon, 8 Aug 2022 01:37:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922657; bh=b9PPvqIUFkRcJBxTYmFhQqFfT0RTP2TTSTI7ENwS18Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u1m47u3DT9ibmUaIg45jzkvJkwhoTi+LkbU3WCTkKLho1Mrz5VcelzqfN894vwYE6 lbCFKr06rW4MTNTrXwEgwDM5vXHvt3EOsO/9WB8hm9rkhifNTd0HhYE1EamcVSGIxg arLS3Zz2+lUTv7dOOhOfE8rSpH+GwpmU8o5TgcxbuTXXC1K36sskydneZd+zPOoo/y /nQBCjSpBFpoqMv9Vyxl0NS/TlCcp7noQI/Lr2dYhs7bILp9TSu7fi0I5EJNnSkqrh mDi7UC9mZnflC4iWxgBOK76p22jKTjmrG4hESpEVAP/IKZ3kXLA40+ZVSSvSPlIKmC fBMGri6yX/dYA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pavel Begunkov , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, imagedong@tencent.com, luiz.von.dentz@intel.com, vasily.averin@linux.dev, jk@codeconstruct.com.au, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 44/45] skbuff: don't mix ubuf_info from different sources Date: Sun, 7 Aug 2022 21:35:48 -0400 Message-Id: <20220808013551.315446-44-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013551.315446-1-sashal@kernel.org> References: <20220808013551.315446-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pavel Begunkov [ 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 Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/skbuff.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 5ebef94e14dc..891db074981e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1213,6 +1213,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