From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 3795E30C343 for ; Sun, 10 May 2026 18:51:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778439071; cv=none; b=A188k93XdGtvirDs/pTIPegbPrvBYLpx1wCNjUU0xc8rWG2moonRPqsVDBhSgKVoLhSR5M70M1omamc9YmSLD54ve2881LXLQEI0K7hnbReaN0VPlEoYHIUaaC/cdA7tFmbiKCE0CpXTijUmwTJPEJnp8Ll8YkRSgpmhpK4X7lw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778439071; c=relaxed/simple; bh=NFohv07ge5408h44vUzdjRJjiW+AaiGwDIADhNNE0Bs=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=RYfZOEKadQHDDOx6y8xfux0IponE9DFBOCQaTL6x6yYNdx/crhwCkrhtszgT3zRmln3lYFfSz2I8VQHfNxmEdLov5NDsmC2PqywVLeF4gXoNiGX6RQE+ZRe+5slA0AtY0FDd+zWRZvH3eOiLBZ4m6UKCtCzqvsnzXhwHoMKdVpY= 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=ZR8dQ+LQ; arc=none smtp.client-ip=209.85.210.174 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="ZR8dQ+LQ" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-82fbdd60b64so2698793b3a.3 for ; Sun, 10 May 2026 11:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778439069; x=1779043869; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=byRCK3EzK0lMDns7NqD8IGNCASe8yk9ZtrezoQnoEvU=; b=ZR8dQ+LQs48ddckBD6U5DWsYCBEc0qw4fX2MqNWaEVnC/KH1diWnfJqElDwGSmljch ha21lKUzxAfodMtWW0mYvaa61//BP1ozoek8EDPuiY4DORCTkEF2lPO3u8BwOQGcJ01M jfNsZBM6BgUePf0JRi+EYluQA3oQ+L/kZ+bdTax1vsNBcWF9RHBppWFcbC2aY2a8BErA OwKhfQr1LnCbPbqF8ealaHpO/mZhPedXtovWn4Bp8js0IfvPEBS7NwH+jUHVve2hHnIe 246m6ZMpzV7bCvqCAkmwnLLkfTjx7vfX4d+uiONOz93w6f9TCYDCAUeKYEb9x19bT+ZH FMJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778439069; x=1779043869; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=byRCK3EzK0lMDns7NqD8IGNCASe8yk9ZtrezoQnoEvU=; b=XvWgtSZ0dZ7d6fIkdc1UmuOoxrS0AK1+me/JJHGupKh5BHjGTAuxacM9JYsYoDEykp ua81VO1XyBsNwbwKtNnXmIxvmIYnLBwDDGUGBa+nn+hJMmXPdWRFadiPUZp2i6QYw0hG o+f3hLyKSBC5EJPgAqDC2HLgYB24N6r6+YNd1zCNh/wlMUshcGFP4qZDGHoRXLI2z3xw DuMDzMA1YkpxR4QPpjXaSmcsRXXNnezwY58hHvnTjcAXwtM8H4ArW4BGnJNN/FDRPzGz eeypvPWq5TXy93wEAF8N2xC9oGufzzgpP7XeS97xPkAAz4FAwn2XwuhAhxA64yOnDluK 4GdQ== X-Forwarded-Encrypted: i=1; AFNElJ8XuNbl3RJIMZZjd/yCIpqMy31+Z6EY4rx0i8jqWDgPTjwwvd+2qIakgfdCzK0WKM29t3Ubmsc=@vger.kernel.org X-Gm-Message-State: AOJu0YxfN9So80jnAgPlDy5qDK+fv8FemHftw9zBxaTuxYeQbyddHEIf JJXCkHxXI+fewWag4GklwCjf0NrOWeaugaXO8mDd5pGQqR8UnGKAnWDCIYj4vg== X-Gm-Gg: Acq92OFsi+K6UKC0aJXrwCz1Ukfq4SvcO3YuLNmjY+maErejHDUd7r7SwQsdGnm8A6o D4mekch+f+qWGuTp5WBBwQswFle8eEPIaHY8M4OVy8O1ujoWt3qMH1RAoToE4/zUYO8XBxOGuX0 vKym3tL5WluyQGJ3+ntShXrFC3mLmLqSoj5qGeQq1n2nzxkw56+Mg2IuUuUaacpG3GQOfiTvwmc lx+YK608B940zoBeRN4XbGSnHT176zejm5JYcoX5JnmFrGACcPoAJMtoy9nxUlxktHJOYNvNw5t AEzdVoddANyYoXfz343O0Jxdb8y/Zi7cWzsIH3xpLbhTqngSMkQbMeCfv4l2J0xCJ6Afxmb1UbG tuo1w2r9tdWVOYy1Y1JC8SHP/nXKOonSoDq5XWSb1XQaqDHebS1XO2k/rbrILD0ZCTaxhmzBEuk i3Z2wrenlIj/VER1QJCaawzIXeo9Hky0pWujhnDaPau/VvmDgHrGnyrQ== X-Received: by 2002:a05:6a00:a254:b0:82f:9e98:1356 with SMTP id d2e1a72fcca58-83e39e3a166mr6381872b3a.20.1778439069437; Sun, 10 May 2026 11:51:09 -0700 (PDT) Received: from v4bel ([58.123.110.97]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8396563f381sm21919263b3a.6.2026.05.10.11.51.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2026 11:51:09 -0700 (PDT) Date: Mon, 11 May 2026 03:51:05 +0900 From: Hyunwoo Kim To: kuba@kernel.org, dhowells@redhat.com, marc.dionne@auristor.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, horms@kernel.org, qingfang.deng@linux.dev, jiayuan.chen@linux.dev Cc: linux-afs@lists.infradead.org, netdev@vger.kernel.org, imv4bel@gmail.com Subject: [PATCH net] rxrpc: Use skb_ensure_writable() before in-place decryption Message-ID: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Writing to any frag is incorrect since frag pages can be shared. Use skb_ensure_writable() to ensure the skb is writable before in-place decryption. Fixes: aa54b1d27fe0 ("rxrpc: Also unshare DATA/RESPONSE packets when paged frags are present") Signed-off-by: Hyunwoo Kim --- net/rxrpc/call_event.c | 18 ++---------------- net/rxrpc/conn_event.c | 23 +++++------------------ 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index 2b19b252225e..837e121ed9a6 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -334,22 +334,8 @@ bool rxrpc_input_call_event(struct rxrpc_call *call) if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA && sp->hdr.securityIndex != 0 && - (skb_cloned(skb) || - skb_has_frag_list(skb) || - skb_has_shared_frag(skb))) { - /* Unshare the packet so that it can be - * modified by in-place decryption. - */ - struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC); - - if (nskb) { - rxrpc_new_skb(nskb, rxrpc_skb_new_unshared); - rxrpc_input_call_packet(call, nskb); - rxrpc_free_skb(nskb, rxrpc_skb_put_call_rx); - } else { - /* OOM - Drop the packet. */ - rxrpc_see_skb(skb, rxrpc_skb_see_unshare_nomem); - } + skb_ensure_writable(skb, skb->len)) { + rxrpc_see_skb(skb, rxrpc_skb_see_unshare_nomem); } else { rxrpc_input_call_packet(call, skb); } diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index 442414d90ba1..a9eaad970e0c 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -245,26 +245,13 @@ static int rxrpc_verify_response(struct rxrpc_connection *conn, { int ret; - if (skb_cloned(skb) || skb_has_frag_list(skb) || - skb_has_shared_frag(skb)) { - /* Copy the packet if shared so that we can do in-place - * decryption. - */ - struct sk_buff *nskb = skb_copy(skb, GFP_NOFS); - - if (nskb) { - rxrpc_new_skb(nskb, rxrpc_skb_new_unshared); - ret = conn->security->verify_response(conn, nskb); - rxrpc_free_skb(nskb, rxrpc_skb_put_response_copy); - } else { - /* OOM - Drop the packet. */ - rxrpc_see_skb(skb, rxrpc_skb_see_unshare_nomem); - ret = -ENOMEM; - } - } else { - ret = conn->security->verify_response(conn, skb); + if (skb_ensure_writable(skb, skb->len)) { + rxrpc_see_skb(skb, rxrpc_skb_see_unshare_nomem); + return -ENOMEM; } + ret = conn->security->verify_response(conn, skb); + return ret; } -- 2.43.0