From: David Howells <dhowells@redhat.com>
To: linux-security-module@vger.kernel.org
Cc: keyrings@linux-nfs.org, dhowells@redhat.com,
justinmattock@gmail.com, linux-kernel@vger.kernel.org
Subject: [PATCH] KEYS: Use the variable 'key' in keyctl_describe_key()
Date: Mon, 28 Jun 2010 14:05:04 +0100 [thread overview]
Message-ID: <20100628130504.9134.11866.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <1277621246-10960-2-git-send-email-justinmattock@gmail.com>
keyctl_describe_key() turns the key reference it gets into a usable key pointer
and assigns that to a variable called 'key', which it then ignores in favour of
recomputing the key pointer each time it needs it. Make it use the precomputed
pointer instead.
Without this patch, gcc 4.6 reports that the variable key is set but not used:
building with gcc 4.6 I'm getting a warning message:
CC security/keys/keyctl.o
security/keys/keyctl.c: In function 'keyctl_describe_key':
security/keys/keyctl.c:472:14: warning: variable 'key' set but not used
Reported-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---
security/keys/keyctl.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 639226a..b2b0998 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -505,13 +505,11 @@ okay:
ret = snprintf(tmpbuf, PAGE_SIZE - 1,
"%s;%d;%d;%08x;%s",
- key_ref_to_ptr(key_ref)->type->name,
- key_ref_to_ptr(key_ref)->uid,
- key_ref_to_ptr(key_ref)->gid,
- key_ref_to_ptr(key_ref)->perm,
- key_ref_to_ptr(key_ref)->description ?
- key_ref_to_ptr(key_ref)->description : ""
- );
+ key->type->name,
+ key->uid,
+ key->gid,
+ key->perm,
+ key->description ?: "");
/* include a NUL char at the end of the data */
if (ret > PAGE_SIZE - 1)
next prev parent reply other threads:[~2010-06-28 13:05 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-27 6:47 [PATCH 0/5] Fix gcc 4.6.0 set but unused variable warnings Justin P. Mattock
2010-06-27 6:47 ` [PATCH 1/5]security:key.c Fix warning: variable 'key' set but not used Justin P. Mattock
2010-06-28 13:05 ` David Howells [this message]
2010-06-28 23:01 ` [Keyrings] [PATCH] KEYS: Use the variable 'key' in keyctl_describe_key() James Morris
2010-06-27 6:47 ` [PATCH 2/5]security:ebitmap.c Fix warning: variable 'e_sft' set but not used Justin P. Mattock
2010-06-27 6:47 ` [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' " Justin P. Mattock
2010-06-27 6:47 ` [PATCH 4/5]block:cryptoloop Fix warning: variable 'cipher' " Justin P. Mattock
2010-06-27 6:47 ` [PATCH 5/5]bluetooth:hci_bcsp Fix operation on 'bcsp->msgq_txseq' may be undefined Justin P. Mattock
2010-06-27 7:31 ` Gustavo F. Padovan
2010-06-28 12:57 ` [PATCH] Bluetooth: Fix abuse of the preincrement operator David Howells
2010-06-28 13:12 ` Gustavo F. Padovan
2010-06-30 20:10 ` David Miller
2010-06-28 17:44 ` Justin P. Mattock
2010-06-28 12:38 ` [PATCH 1/5]security:key.c Fix warning: variable 'key' set but not used David Howells
2010-06-28 17:48 ` Justin P. Mattock
2010-06-28 12:44 ` [PATCH 2/5]security:ebitmap.c Fix warning: variable 'e_sft' " David Howells
2010-06-28 17:49 ` Justin P. Mattock
2010-06-28 12:48 ` [PATCH 3/5]acpi:glue.c Fix warning: variable 'ret' " David Howells
2010-06-28 17:52 ` Justin P. Mattock
2010-06-28 18:47 ` David Howells
2010-06-28 19:03 ` Justin P. Mattock
2010-06-29 3:23 ` Justin P. Mattock
2010-06-29 15:47 ` David Howells
2010-06-29 17:14 ` Justin P. Mattock
2010-06-29 21:53 ` Justin P. Mattock
2010-06-30 9:13 ` David Howells
2010-06-30 13:21 ` Justin P. Mattock
2010-06-30 19:47 ` Justin P. Mattock
2010-07-01 9:31 ` David Howells
2010-07-01 13:41 ` Justin P. Mattock
2010-07-01 20:01 ` Justin P. Mattock
2010-07-02 0:10 ` David Howells
2010-07-02 0:59 ` Justin P. Mattock
2010-06-28 19:08 ` Justin P. Mattock
2010-06-28 12:49 ` [PATCH 4/5]block:cryptoloop Fix warning: variable 'cipher' " David Howells
2010-06-28 12:52 ` [PATCH 5/5]bluetooth:hci_bcsp Fix operation on 'bcsp->msgq_txseq' may be undefined David Howells
2010-06-28 13:02 ` Bernd Petrovitsch
2010-06-28 17:56 ` Justin P. Mattock
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=20100628130504.9134.11866.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=justinmattock@gmail.com \
--cc=keyrings@linux-nfs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@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
Powered by JetHome