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 107562BEFEF; Mon, 13 Apr 2026 16:09:30 +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=1776096571; cv=none; b=T/RWbG/ckV0WzkYNtR1eBTpLulNx0GOZTA7yQWa+4eLCYEFnBR+c6Gpdq3IAtG+vIe1Pe79SSuUYI6FEe8VVv9EGCnI6tTNiM6YRcbxGesgIx+Ut5qDtDCOr7TZlUugQSYIU3BwLxIyZ5iniAKwg8ncv/zQC1Jpw7W3nB+gOlKI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776096571; c=relaxed/simple; bh=wniFVUml3x4vUwRTy/p7F0tmXTFBebjTX4KMj5m9LtQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QoB6Cjdrn+d7MzizZC+i0Bk7cOtg1EJrxfNZvQLPIs1rOd3mbVvmvGxs8rpfolQtaSw4I/+7GowsDcL++CIWqYq5en9jCOGLS7SDwozD8iCn8PiQnu787fNUZYuLp0OOQnCAz+yNcakuzs7EYS5kDNlkPxCR3hC1k2VmVLkx8uE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NAwaLS1L; 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="NAwaLS1L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E8C3C2BCB0; Mon, 13 Apr 2026 16:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776096570; bh=wniFVUml3x4vUwRTy/p7F0tmXTFBebjTX4KMj5m9LtQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NAwaLS1L3OrGGHPnPLsCqxWVSoajvasS/0CLaryK8UgpRD/R7cNa2OvwvwTxf/YD3 Lfx4YjIIUXZ76KOTDmpEcLorWuIKT/EEBLhtZumLy+BB6Y+qSyrsRcwLF8yT9VXb8s d4IvEMOrp//UvRJRF1qAJSn4c05gUV0x/YJY151Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , Marc Dionne , Jeffrey Altman , Simon Horman , linux-afs@lists.infradead.org, stable@kernel.org, Jakub Kicinski Subject: [PATCH 6.18 62/83] rxrpc: Fix key quota calculation for multitoken keys Date: Mon, 13 Apr 2026 18:00:30 +0200 Message-ID: <20260413155733.323880333@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413155731.019638460@linuxfoundation.org> References: <20260413155731.019638460@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells commit bdbfead6d38979475df0c2f4bad2b19394fe9bdc upstream. 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 Signed-off-by: Greg Kroah-Hartman --- net/rxrpc/key.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/net/rxrpc/key.c +++ b/net/rxrpc/key.c @@ -72,7 +72,7 @@ static int rxrpc_preparse_xdr_rxkad(stru return -EKEYREJECTED; plen = sizeof(*token) + sizeof(*token->kad) + tktlen; - prep->quotalen = datalen + plen; + prep->quotalen += datalen + plen; plen -= sizeof(*token); token = kzalloc(sizeof(*token), GFP_KERNEL); @@ -199,7 +199,7 @@ static int rxrpc_preparse_xdr_yfs_rxgk(s } plen = sizeof(*token) + sizeof(*token->rxgk) + tktlen + keylen; - prep->quotalen = datalen + plen; + prep->quotalen += datalen + plen; plen -= sizeof(*token); token = kzalloc(sizeof(*token), GFP_KERNEL); @@ -460,6 +460,7 @@ static int rxrpc_preparse(struct key_pre 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_pre goto error; plen = sizeof(*token->kad) + v1->ticket_length; - prep->quotalen = plen + sizeof(*token); + prep->quotalen += plen + sizeof(*token); ret = -ENOMEM; token = kzalloc(sizeof(*token), GFP_KERNEL);