[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mm-commits
Subject:    + keys-fix-permissions-check-for-update-vs-add.patch added to -mm tree
From:       akpm () osdl ! org
Date:       2005-11-30 23:05:05
Message-ID: 200511302303.jAUN3k5Z014580 () shell0 ! pdx ! osdl ! net
[Download RAW message or body]


The patch titled

     Keys: Fix permissions check for update vs add

has been added to the -mm tree.  Its filename is

     keys-fix-permissions-check-for-update-vs-add.patch


From: David Howells <dhowells@redhat.com>

Permit add_key() to once again update a matching key rather than adding a
new one if a matching key already exists in the target keyring.

This bug causes add_key() to always add a new key, displacing the old from
the target keyring.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 security/keys/keyring.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN security/keys/keyring.c~keys-fix-permissions-check-for-update-vs-add security/keys/keyring.c
--- 25/security/keys/keyring.c~keys-fix-permissions-check-for-update-vs-add	Wed Nov 30 15:05:02 2005
+++ 25-akpm/security/keys/keyring.c	Wed Nov 30 15:05:02 2005
@@ -526,7 +526,7 @@ key_ref_t __keyring_search_one(key_ref_t
 			    (!key->type->match ||
 			     key->type->match(key, description)) &&
 			    key_permission(make_key_ref(key, possessed),
-					   perm) < 0 &&
+					   perm) == 0 &&
 			    !test_bit(KEY_FLAG_REVOKED, &key->flags)
 			    )
 				goto found;
_

Patches currently in -mm which might be from dhowells@redhat.com are

keys-fix-permissions-check-for-update-vs-add.patch
frv-clean-up-bootmem-allocators-page-freeing-algorithm.patch
security-possible-cleanups.patch
nommu-provide-shared-writable-mmap-support-on-ramfs.patch
nommu-provide-shared-writable-mmap-support-on-ramfs-tidy.patch
nommu-make-sysv-ipc-shm-use-ramfs-facilities-on-nommu.patch
frv-implement-futex-operations-for-frv.patch
frv-make-futex-code-compilable-on-nommu.patch
frv-fix-frv-signal-handling.patch
frv-improve-signal-handling.patch
x86-handle-wsign-compare-in-bitops.patch
permit-multiple-inclusion-of-linux-pagevech.patch
add-list_for_each_entry_safe_reverse.patch
keys-permit-key-expiry-time-to-be-set.patch
keys-discard-duplicate-keys-from-a-keyring-on-link.patch
keys-permit-running-process-to-instantiate-keys.patch
keys-permit-running-process-to-instantiate-keys-warning-fix.patch
fix-possible-page_cache_shift-overflows.patch
export-file_ra_state_init-again.patch
provide-a-filesystem-specific-syncable-page-bit.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]