lkml.org 
[lkml]   [2010]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] KEYS: Use the variable 'key' in keyctl_describe_key()
    Date
    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)


    \
     
     \ /
      Last update: 2010-06-28 15:07    [W:0.021 / U:1.976 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site