From: David Howells Date: Mon, 29 Dec 2008 00:41:51 +0000 (+0000) Subject: KEYS: Fix variable uninitialisation warnings X-Git-Tag: v2.6.29-rc1~573 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eca1bf5b4fab56d2feb1572d34d59fcd92ea7df3;p=linux-2.6-omap-h63xx.git KEYS: Fix variable uninitialisation warnings Fix variable uninitialisation warnings introduced in: commit 8bbf4976b59fc9fc2861e79cab7beb3f6d647640 Author: David Howells Date: Fri Nov 14 10:39:14 2008 +1100 KEYS: Alter use of key instantiation link-to-keyring argument As: security/keys/keyctl.c: In function 'keyctl_negate_key': security/keys/keyctl.c:976: warning: 'dest_keyring' may be used uninitialized in this function security/keys/keyctl.c: In function 'keyctl_instantiate_key': security/keys/keyctl.c:898: warning: 'dest_keyring' may be used uninitialized in this function Some versions of gcc notice that get_instantiation_key() doesn't always set *_dest_keyring, but fail to observe that if this happens then *_dest_keyring will not be read by the caller. Reported-by: Linus Torvalds Signed-off-by: David Howells Signed-off-by: James Morris --- diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 7c72baa02f2..6688765bd8b 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -838,11 +838,11 @@ static long get_instantiation_keyring(key_serial_t ringid, { key_ref_t dkref; + *_dest_keyring = NULL; + /* just return a NULL pointer if we weren't asked to make a link */ - if (ringid == 0) { - *_dest_keyring = NULL; + if (ringid == 0) return 0; - } /* if a specific keyring is nominated by ID, then use that */ if (ringid > 0) {