From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D66CA32A3DA for ; Mon, 3 Aug 2026 17:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785778547; cv=none; b=PqPT4PMxj0QW3U7Duh+BV1mIYagkfXfCLbNH53VKkeRuebwhYIG4awUVFZr3sT5B22T4P2lC3M/sF0/OWaqlIy+B/isPS7n/zoUfymgPyxtet+gMJffoPL2TXOIN9MaUqD7YVGLuVEv5k+m05FJPa7fxaf+A8acCPBqGt6vr00Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785778547; c=relaxed/simple; bh=FiUBM3pyIcZWxYa30PKi/+pHT/nkYBTk3tEfQdUPHco=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ioVDNhqbLMg7VezHtEG7lq0k4DLk2XygPbrL3FEO3/KZyAUJQfH4hHCoUQsXdkMLZxcVfM3izckG2oYvzWlFQyFeXtH9MBd6J5S2MFCr/N2YYegZuogAOppDlHsTF53QUONRGICNOpjE5qgTFD4LWkcpl787cUkIvtZ13m+wR6Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GzfsdrqY; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GzfsdrqY" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-84a4d8fd6ecso3930368b3a.1 for ; Mon, 03 Aug 2026 10:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785778545; x=1786383345; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=aDzXObStBW/XIcDpadk6T5ga3cktgWOfpSl9mIernRA=; b=GzfsdrqYhvtH0N8pUWntDajwlN8/5MHe8AO8R1OY7kPs6P6hfCiUiRsKJpWYJ55r+C D/lGTvsO+Oco554wvJ5lnmKv6Efoffw+31TqwjKYeKbt3tGKeeccGJvj/wOKqI4tdMDv FYG1qW8T6aEy3TwZV8v5Oy/9sTJOo073moujcKZxO6UuhfwdtreOvLWS9rYH/+TAjonz dqk1F0joS9LUfBcihc0R3X2Vk0CeMijkiuz5+kbB1HNJj07xobETUfseQsOmwyHB6Q0v 4hagTaaXKf1qYljvdH20Qx3F9JTtLsyMFfbDK9F9eD9MAmazcF6p1BcyVOVc6srSbumZ TSag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785778545; x=1786383345; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=aDzXObStBW/XIcDpadk6T5ga3cktgWOfpSl9mIernRA=; b=e/A5HcHWYdaVmZi5mgnS7AWO83Sdimi3y5IuA0bWv/WPEzDVgbtrwnRAlzld8A7FR5 uWM87kU+/w36yANvlFKXPsJRK1l6p4GKhj5k5LONnOIpRZZDZ0Wb/WkqsPL0ciXVESet t4CgDIgiZY4HJS6dOtNjjwxDtINwK0LuEBd3Lk7CQ9ry31qF42JX1didfvndqILp6px8 LYptDYq+ysB5ZPsCBBnHWxgj96wjvZkmSlSjnRdE2hLye3Az0XijhtpD9k0KJvAb6adI wvMOXCc7a8260h9VCGgT+VzjGMzD1AcwOjgzSBP/2SWY4n6sMYz+mOypgLfaVdJfIATr bS1g== X-Forwarded-Encrypted: i=1; AHgh+RqalU1dBgBTTY3kYIeLPjSRuSV6+OUG8jMaW017mII4nfPdkWGwzxCXqkAJKN+2KVB1iJEZOG7rQNE+xgg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7VYxSmBjCdZRmQ5XZJwUjfoM37rFklrMpSqqZ7FjQC9j3O3j9 3MPqvPOX5HSx6XImq7YGEBTKSwKGi6Qj9MFW+w82B1p0GZhg0RR1zmGu X-Gm-Gg: AR+sD13xxvMRCPi8Ms83EOXE/uYpAbxpmiE8/Jh/qXxlZyFFv9WUr1G0df4k/cQ95Yu EEvovOZoJnklIoBneDCXEj0wLJyDpHWaQOXb7BMVlGCCvFfeEmRWmlRxK97zaHI9eeDN/n2Puax B7F93TftAxHz+VQj1s9CEPzIb9dtFy3prA/rO/CzhXG2hRw/CPGS2AooxWLjeCYG9ZbZo9FKzCY qae+wUWqATx+M/49RvaQwsY8EGEaCPuJzZBdrN2C0Z5pnjeJQQQenFBFdb86rMy8n+FrF6LAeg3 Jy2wn8rUo7Y8vB7axgpr7wDPkoAXvXtILnHPefgsUB8AbJqQNg0Cp8c8wRMUrmi5718d1AXaMKD uay0E2KYnl9GiJ7MK6f2EwhuPUMy17KKJ0Zq1hraBLDn8DLTCbA8UwYxQ1yUPhG7aZk/zXwS0+t DvEe/S95yNqVIn+BLDBculmmHdrxtXpypS/dthgAnyw5+SH61HhdvEWnx+JH9w6iqzRBldNUeUf bde8xJiig== X-Received: by 2002:a05:6a00:180f:b0:845:ebe2:c656 with SMTP id d2e1a72fcca58-84ee49549eemr9286454b3a.47.1785778545099; Mon, 03 Aug 2026 10:35:45 -0700 (PDT) Received: from devvm29614.prn0.facebook.com ([2a03:2880:ff:54::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84edbd3a4b6sm3994017b3a.4.2026.08.03.10.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 10:35:44 -0700 (PDT) Date: Mon, 3 Aug 2026 10:35:42 -0700 From: Bobby Eshleman To: Mina Almasry Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, kerneljasonxing@gmail.com, kuniyu@google.com, bjorn@kernel.org, jiayuan.chen@linux.dev, kaiyuanz@google.com, willemb@google.com, asml.silence@gmail.com, sdf@fomichev.me, fw@strlen.de, Neal Cardwell , Ralf Lici , Will Deacon Subject: Re: [PATCH net v2 3/3] net: tcp: block standard payload injection into devmem skbs Message-ID: References: <20260803171441.408014-1-almasrymina@google.com> <20260803171441.408014-3-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260803171441.408014-3-almasrymina@google.com> On Mon, Aug 03, 2026 at 05:14:41PM +0000, Mina Almasry wrote: > Protect tcp_sendmsg_locked() from mistakenly appending non-zerocopy > page fragments to unreadable devmem skbs. Create a new segment instead. > > Fixes: bd61848900bff ("net: devmem: Implement TX path") > Cc: Pavel Begunkov > Cc: Stanislav Fomichev > Cc: Bobby Eshleman > Signed-off-by: Mina Almasry > Reviewed-by: Pavel Begunkov > --- > net/ipv4/tcp.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c > index 455441f1b6949..186a36c698798 100644 > --- a/net/ipv4/tcp.c > +++ b/net/ipv4/tcp.c > @@ -1278,6 +1278,11 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) > if (copy > msg_data_left(msg)) > copy = msg_data_left(msg); > > + if (zc != MSG_ZEROCOPY && unlikely(!skb_frags_readable(skb))) { > + tcp_mark_push(tp, skb); > + goto new_segment; > + } > + > if (zc == 0) { > bool merge = true; > int i = skb_shinfo(skb)->nr_frags; > -- > 2.55.0.571.g244d577d93-goog > Reviewed-by: Bobby Eshleman