lkml.org 
[lkml]   [2011]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 002/260] KEYS: Return more accurate error codes
    Date
    From: Dan Carpenter <error27@gmail.com>

    commit 4d09ec0f705cf88a12add029c058b53f288cfaa2 upstream.

    We were using the wrong variable here so the error codes weren't being returned
    properly. The original code returns -ENOKEY.

    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: James Morris <jmorris@namei.org>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    security/keys/process_keys.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
    index 06c2ccf..20a38fe 100644
    --- a/security/keys/process_keys.c
    +++ b/security/keys/process_keys.c
    @@ -508,7 +508,7 @@ try_again:

    ret = install_thread_keyring();
    if (ret < 0) {
    - key = ERR_PTR(ret);
    + key_ref = ERR_PTR(ret);
    goto error;
    }
    goto reget_creds;
    @@ -526,7 +526,7 @@ try_again:

    ret = install_process_keyring();
    if (ret < 0) {
    - key = ERR_PTR(ret);
    + key_ref = ERR_PTR(ret);
    goto error;
    }
    goto reget_creds;
    @@ -585,7 +585,7 @@ try_again:

    case KEY_SPEC_GROUP_KEYRING:
    /* group keyrings are not yet supported */
    - key = ERR_PTR(-EINVAL);
    + key_ref = ERR_PTR(-EINVAL);
    goto error;

    case KEY_SPEC_REQKEY_AUTH_KEY:
    --
    1.7.3.3


    \
     
     \ /
      Last update: 2011-01-02 08:25    [W:0.019 / U:32.224 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site