diff --git a/[refs] b/[refs] index 6a24bf9de01e..084411587260 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 765aaafe38050790301e89745b991dbdf3dded4c +refs/heads/master: 27d6379894be4a81984da4d48002196a83939ca9 diff --git a/trunk/security/keys/process_keys.c b/trunk/security/keys/process_keys.c index f8e7251ae2c8..504bdd2452bd 100644 --- a/trunk/security/keys/process_keys.c +++ b/trunk/security/keys/process_keys.c @@ -207,7 +207,7 @@ static int install_process_keyring(void) ret = install_process_keyring_to_cred(new); if (ret < 0) { abort_creds(new); - return ret != -EEXIST ?: 0; + return ret != -EEXIST ? ret : 0; } return commit_creds(new);