diff --git a/[refs] b/[refs] index 8e7cd3dab36d..e765c96d6b74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a07c48ad5be5cbf32a2741f10e6fbf4bbfcaa362 +refs/heads/master: 3a46741804a4226cd837d1246eed95d4161f7159 diff --git a/trunk/fs/ecryptfs/keystore.c b/trunk/fs/ecryptfs/keystore.c index 6154cde3a052..5aceff202dc0 100644 --- a/trunk/fs/ecryptfs/keystore.c +++ b/trunk/fs/ecryptfs/keystore.c @@ -1202,8 +1202,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, crypt_stat->key_size); } out: - if (msg) - kfree(msg); + kfree(msg); return rc; }