From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 926673C872C for ; Mon, 13 Apr 2026 12:50:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776084633; cv=none; b=ExSUjmBMNpbS52A7hc9vjj/lHn40nBtjhm97KnoncFlqJ8zBuLGxq58BXA6+/0jXc4LX8nMGx5qc3y9rLjBfzZYP3/qFotyhrlRInhQjuuyYvm4HJZiqegzn/uAHJv/apqu+L44RUBDHx7ORbLrEAqHz209vO5MMpt74yxdiyQo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776084633; c=relaxed/simple; bh=wYdcmUl7n5RArXsn/eyNsJlvbylzpVQATZWC8vdD2A4=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=mMi3U3kz7wSDVBJ+avwuZVqDAiZdWpcDSOBXb0TncqzyaOVd9HpkGRWDwXdrihB8wdj19fkPJrh/e1jP/yDxB8dL8kfOz7Zw+LNuHhdEv0llGYT2Aj9BZcDR3PrKVf9bWjlMHcSbP501Vu9IsTqAjmL+R8nkiuWdYfGpx/r4hmI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UeSy5XxK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UeSy5XxK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27CE9C2BCAF; Mon, 13 Apr 2026 12:50:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776084633; bh=wYdcmUl7n5RArXsn/eyNsJlvbylzpVQATZWC8vdD2A4=; h=Subject:To:Cc:From:Date:From; b=UeSy5XxKH/D7/+djzmvGFchNoB/jDE5ohtu3DdPFlx2u8fdpyLdxgcTp2FEe6uE6o IBHaqMBpGP3PW4YJIhA/2byvsev1yAMfxqI/5wojEa+i7HXXJ9hcxmhm7XWn3n7azS 2VrfuXMCUqzitNwxmFPAIJcaoY+Q3hfRncbfVa8Y= Subject: FAILED: patch "[PATCH] rxrpc: Fix key quota calculation for multitoken keys" failed to apply to 5.15-stable tree To: dhowells@redhat.com,horms@kernel.org,jaltman@auristor.com,kuba@kernel.org,marc.dionne@auristor.com Cc: From: Date: Mon, 13 Apr 2026 14:29:36 +0200 Message-ID: <2026041336-pavestone-racing-acf1@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x bdbfead6d38979475df0c2f4bad2b19394fe9bdc # git commit -s git send-email --to '' --in-reply-to '2026041336-pavestone-racing-acf1@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From bdbfead6d38979475df0c2f4bad2b19394fe9bdc Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 8 Apr 2026 13:12:29 +0100 Subject: [PATCH] rxrpc: Fix key quota calculation for multitoken keys In the rxrpc key preparsing, every token extracted sets the proposed quota value, but for multitoken keys, this will overwrite the previous proposed quota, losing it. Fix this by adding to the proposed quota instead. Fixes: 8a7a3eb4ddbe ("KEYS: RxRPC: Use key preparsing") Closes: https://sashiko.dev/#/patchset/20260319150150.4189381-1-dhowells%40redhat.com Signed-off-by: David Howells cc: Marc Dionne cc: Jeffrey Altman cc: Simon Horman cc: linux-afs@lists.infradead.org cc: stable@kernel.org Link: https://patch.msgid.link/20260408121252.2249051-2-dhowells@redhat.com Signed-off-by: Jakub Kicinski diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c index 85078114b2dd..af403f0ccab5 100644 --- a/net/rxrpc/key.c +++ b/net/rxrpc/key.c @@ -72,7 +72,7 @@ static int rxrpc_preparse_xdr_rxkad(struct key_preparsed_payload *prep, return -EKEYREJECTED; plen = sizeof(*token) + sizeof(*token->kad) + tktlen; - prep->quotalen = datalen + plen; + prep->quotalen += datalen + plen; plen -= sizeof(*token); token = kzalloc_obj(*token); @@ -199,7 +199,7 @@ static int rxrpc_preparse_xdr_yfs_rxgk(struct key_preparsed_payload *prep, } plen = sizeof(*token) + sizeof(*token->rxgk) + tktlen + keylen; - prep->quotalen = datalen + plen; + prep->quotalen += datalen + plen; plen -= sizeof(*token); token = kzalloc_obj(*token); @@ -460,6 +460,7 @@ static int rxrpc_preparse(struct key_preparsed_payload *prep) memcpy(&kver, prep->data, sizeof(kver)); prep->data += sizeof(kver); prep->datalen -= sizeof(kver); + prep->quotalen = 0; _debug("KEY I/F VERSION: %u", kver); @@ -497,7 +498,7 @@ static int rxrpc_preparse(struct key_preparsed_payload *prep) goto error; plen = sizeof(*token->kad) + v1->ticket_length; - prep->quotalen = plen + sizeof(*token); + prep->quotalen += plen + sizeof(*token); ret = -ENOMEM; token = kzalloc_obj(*token);