Merge tag 'keys-v7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull key fixes from Jarkko Sakkinen:

 - Expand key->datalen and key->quotalen in order to avoid integer
   truncation and the leak of quota.

 - Enforce KEY_MAX_DESC_SIZE limits across in-kernel and
   payload-generated paths.

 - Verify the key identity in __key_unlink_begin() as type and
   description could also refer to a more recently linked key with
   matching properties as the one being unlinked.

 - Fix key update race with key GC

* tag 'keys-v7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  KEYS: Protect the update method check against type removal
  KEYS: Verify the key identity in __key_unlink_begin
  KEYS: Reject descriptions larger than KEY_MAX_DESC_SIZE
  KEYS: Expand key->{datalen,quotalen} to unsigned int
This commit is contained in:
Linus Torvalds
2026-11-09 16:02:54 -08:00
6 changed files with 50 additions and 18 deletions
+3 -3
View File
@@ -385,7 +385,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid)
goto out_revert_creds;
} else if (sidkey->datalen < CIFS_SID_BASE_SIZE) {
rc = smb_EIO1(smb_eio_trace_malformed_sid_key, sidkey->datalen);
cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%hu)\n",
cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%u)\n",
__func__, sidkey->datalen);
goto invalidate_key;
}
@@ -403,7 +403,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid)
if (ksid_size > sidkey->datalen) {
rc = smb_EIO2(smb_eio_trace_malformed_ksid_key,
ksid_size, sidkey->datalen);
cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%hu, ksid_size=%u)\n",
cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%u, ksid_size=%u)\n",
__func__, sidkey->datalen, ksid_size);
goto invalidate_key;
}
@@ -498,7 +498,7 @@ try_upcall_to_get_id:
*/
BUILD_BUG_ON(sizeof(uid_t) != sizeof(gid_t));
if (sidkey->datalen != sizeof(uid_t)) {
cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%hu)\n",
cifs_dbg(FYI, "%s: Downcall contained malformed key (datalen=%u)\n",
__func__, sidkey->datalen);
key_invalidate(sidkey);
goto out_key_put;
+5 -2
View File
@@ -37,6 +37,9 @@ struct net;
#undef KEY_DEBUGGING
/* Maximum length of a key description, including the trailing NUL */
#define KEY_MAX_DESC_SIZE 4096
#define KEY_POS_VIEW 0x01000000 /* possessor can view a key's attributes */
#define KEY_POS_READ 0x02000000 /* possessor can read key payload / view keyring */
#define KEY_POS_WRITE 0x04000000 /* possessor can update key payload / add link to keyring */
@@ -216,8 +219,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
*/
+18 -8
View File
@@ -245,6 +245,8 @@ struct key *key_alloc(struct key_type *type, const char *desc,
}
desclen = strlen(desc);
if (desclen >= KEY_MAX_DESC_SIZE)
goto error;
quotalen = desclen + 1 + type->def_datalen;
/* get hold of the key tracking for this user */
@@ -829,6 +831,7 @@ static key_ref_t __key_create_or_update(key_ref_t keyring_ref,
key_ref_t key_ref;
int ret;
struct key_restriction *restrict_link = NULL;
size_t desclen;
/* look up the key type to see if it's one of the registered kernel
* types */
@@ -869,7 +872,12 @@ static key_ref_t __key_create_or_update(key_ref_t keyring_ref,
if (!index_key.description)
goto error_free_prep;
}
index_key.desc_len = strlen(index_key.description);
desclen = strlen(index_key.description);
if (desclen >= KEY_MAX_DESC_SIZE) {
key_ref = ERR_PTR(-EINVAL);
goto error_free_prep;
}
index_key.desc_len = desclen;
key_set_index_key(&index_key);
ret = __key_link_lock(keyring, &index_key);
@@ -1093,9 +1101,12 @@ int key_update(key_ref_t key_ref, const void *payload, size_t plen)
if (ret < 0)
return ret;
down_write(&key->sem);
/* attempt to update it if supported */
ret = -EOPNOTSUPP;
if (!key->type->update)
return -EOPNOTSUPP;
goto out;
memset(&prep, 0, sizeof(prep));
prep.data = payload;
@@ -1105,11 +1116,9 @@ int key_update(key_ref_t key_ref, const void *payload, size_t plen)
if (key->type->preparse) {
ret = key->type->preparse(&prep);
if (ret < 0)
goto error;
goto out_free_preparse;
}
down_write(&key->sem);
ret = key->type->update(key, &prep);
if (ret == 0) {
/* Updating a negative key positively instantiates it */
@@ -1117,11 +1126,12 @@ int key_update(key_ref_t key_ref, const void *payload, size_t plen)
notify_key(key, NOTIFY_KEY_UPDATED, 0);
}
up_write(&key->sem);
error:
out_free_preparse:
if (key->type->preparse)
key->type->free_preparse(&prep);
out:
up_write(&key->sem);
return ret;
}
EXPORT_SYMBOL(key_update);
-2
View File
@@ -24,8 +24,6 @@
#include <keys/request_key_auth-type.h>
#include "internal.h"
#define KEY_MAX_DESC_SIZE 4096
static const unsigned char keyrings_capabilities[2] = {
[0] = (KEYCTL_CAPS0_CAPABILITIES |
(IS_ENABLED(CONFIG_PERSISTENT_KEYRINGS) ? KEYCTL_CAPS0_PERSISTENT_KEYRINGS : 0) |
+12 -1
View File
@@ -957,7 +957,6 @@ key_ref_t keyring_search(key_ref_t keyring,
struct keyring_search_context ctx = {
.index_key.type = type,
.index_key.description = description,
.index_key.desc_len = strlen(description),
.cred = current_cred(),
.match_data.cmp = key_default_cmp,
.match_data.raw_data = description,
@@ -965,8 +964,14 @@ key_ref_t keyring_search(key_ref_t keyring,
.flags = KEYRING_SEARCH_DO_STATE_CHECK,
};
key_ref_t key;
size_t desclen;
int ret;
desclen = strlen(description);
if (desclen >= KEY_MAX_DESC_SIZE)
return ERR_PTR(-EINVAL);
ctx.index_key.desc_len = desclen;
if (recurse)
ctx.flags |= KEYRING_SEARCH_RECURSE;
if (type->match_preparse) {
@@ -1501,9 +1506,15 @@ static int __key_unlink_begin(struct key *keyring, struct key *key,
struct assoc_array_edit **_edit)
{
struct assoc_array_edit *edit;
const void *object;
BUG_ON(*_edit != NULL);
object = assoc_array_find(&keyring->keys, &keyring_assoc_array_ops,
&key->index_key);
if (!object || keyring_ptr_to_key(object) != key)
return -ENOENT;
edit = assoc_array_delete(&keyring->keys, &keyring_assoc_array_ops,
&key->index_key);
if (IS_ERR(edit))
+12 -2
View File
@@ -584,7 +584,6 @@ struct key *request_key_and_link(struct key_type *type,
.index_key.type = type,
.index_key.domain_tag = domain_tag,
.index_key.description = description,
.index_key.desc_len = strlen(description),
.cred = current_cred(),
.match_data.cmp = key_default_cmp,
.match_data.raw_data = description,
@@ -595,8 +594,14 @@ struct key *request_key_and_link(struct key_type *type,
};
struct key *key;
key_ref_t key_ref;
size_t desclen;
int ret;
desclen = strlen(description);
if (desclen >= KEY_MAX_DESC_SIZE)
return ERR_PTR(-EINVAL);
ctx.index_key.desc_len = desclen;
kenter("%s,%s,%p,%zu,%p,%p,%lx",
ctx.index_key.type->name, ctx.index_key.description,
callout_info, callout_len, aux, dest_keyring, flags);
@@ -787,7 +792,6 @@ struct key *request_key_rcu(struct key_type *type,
.index_key.type = type,
.index_key.domain_tag = domain_tag,
.index_key.description = description,
.index_key.desc_len = strlen(description),
.cred = current_cred(),
.match_data.cmp = key_default_cmp,
.match_data.raw_data = description,
@@ -797,6 +801,12 @@ struct key *request_key_rcu(struct key_type *type,
};
struct key *key;
key_ref_t key_ref;
size_t desclen;
desclen = strlen(description);
if (desclen >= KEY_MAX_DESC_SIZE)
return ERR_PTR(-EINVAL);
ctx.index_key.desc_len = desclen;
kenter("%s,%s", type->name, description);