Kernel keyring development
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko@kernel.org>
To: David Howells <dhowells@redhat.com>
Cc: keyrings@vger.kernel.org, Eric Biggers <ebiggers@kernel.org>,
	Jarkko Sakkinen <jarkko@kernel.org>,
	stable@vger.kernel.org, Paul Moore <paul@paul-moore.com>,
	James Morris <jmorris@namei.org>,
	"Serge E. Hallyn" <serge@hallyn.com>,
	linux-kernel@vger.kernel.org (open list),
	linux-security-module@vger.kernel.org (open list:SECURITY
	SUBSYSTEM)
Subject: [PATCH v2 1/6] KEYS: Expand key->{datalen,quotalen} to unsigned int
Date: Mon, 19 Oct 2026 21:17:21 +0300	[thread overview]
Message-ID: <20261019181732.449591-2-jarkko@kernel.org> (raw)
In-Reply-To: <20261019181732.449591-1-jarkko@kernel.org>

In key_alloc() and key_payload_reserve(), key->quotalen and key->datalen
can receive values larger than USHRT_MAX.

Change their types from unsigned short to unsigned int so that they can
carry the full payload and avoid truncation.

Cc: stable@vger.kernel.org
Assisted-by: LLM
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
 include/linux/key.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/key.h b/include/linux/key.h
index e40b5267658f..26139c3adf62 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -216,8 +216,8 @@ struct key {
 	kuid_t			uid;
 	kgid_t			gid;
 	key_perm_t		perm;		/* access permissions */
-	unsigned short		quotalen;	/* length added to quota */
-	unsigned short		datalen;	/* payload data length
+	unsigned int		quotalen;	/* length added to quota */
+	unsigned int		datalen;	/* payload data length
 						 * - may not match RCU dereferenced payload
 						 * - payload should contain own length
 						 */
-- 
2.47.3


  reply	other threads:[~2026-10-19 18:17 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-19 18:17 [PATCH v2 0/6] KEYS: rhashtable bug fixes Jarkko Sakkinen
2026-10-19 18:17 ` Jarkko Sakkinen [this message]
2026-10-19 19:12   ` [PATCH v2 1/6] KEYS: Expand key->{datalen,quotalen} to unsigned int Eric Biggers
2026-10-19 20:32     ` Jarkko Sakkinen
2026-10-19 18:17 ` [PATCH v2 2/6] KEYS: Reject @desclen values >= KEY_MAX_DESC_SIZE in key_alloc() Jarkko Sakkinen
2026-10-19 19:17   ` Eric Biggers
2026-10-19 20:46     ` Jarkko Sakkinen
2026-10-20  0:19       ` Jarkko Sakkinen
2026-10-19 18:17 ` [PATCH v2 3/6] KEYS: Prevent overflow of user->{qnkeys,qnbytes} " Jarkko Sakkinen
2026-10-19 19:23   ` Eric Biggers
2026-10-19 20:53     ` Jarkko Sakkinen
2026-10-20  0:26       ` Jarkko Sakkinen
2026-10-19 18:17 ` [PATCH v2 4/6] KEYS: Prevent overflow of quota " Jarkko Sakkinen
2026-10-19 19:25   ` Eric Biggers
2026-10-19 20:55     ` Jarkko Sakkinen
2026-10-19 20:56       ` Jarkko Sakkinen
2026-10-19 18:17 ` [PATCH v2 5/6] KEYS: Reject @datalen values over INT_MAX Jarkko Sakkinen
2026-10-19 19:31   ` Eric Biggers
2026-10-19 21:07     ` Jarkko Sakkinen
2026-10-19 23:55       ` Jarkko Sakkinen
2026-10-20  0:03         ` Jarkko Sakkinen
2026-10-19 18:17 ` [PATCH v2 6/6] KEYS: Verify the key identity in __keyctl_unlink Jarkko Sakkinen
2026-10-19 19:35   ` Eric Biggers
2026-10-19 21:06     ` Jarkko Sakkinen
2026-10-19 21:16       ` Jarkko Sakkinen
2026-10-19 18:29 ` [PATCH v2 0/6] KEYS: rhashtable bug fixes Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261019181732.449591-2-jarkko@kernel.org \
    --to=jarkko@kernel.org \
    --cc=dhowells@redhat.com \
    --cc=ebiggers@kernel.org \
    --cc=jmorris@namei.org \
    --cc=keyrings@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=paul@paul-moore.com \
    --cc=serge@hallyn.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox