| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1434063803-76042-1-git-send-email-jaegeuk@kernel.org> Date: Thu, 11 Jun 2015 16:03:22 -0700 From: Jaegeuk Kim <jaegeuk@...nel.org> To: linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org, linux-f2fs-devel@...ts.sourceforge.net Cc: Jaegeuk Kim <jaegeuk@...nel.org> Subject: [PATCH 1/2] f2fs crypto: fix to handle errors likewise ext4 This patch makes some error handling policies same with ext4. Signed-off-by: Jaegeuk Kim <jaegeuk@...nel.org> --- fs/f2fs/crypto.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/crypto.c b/fs/f2fs/crypto.c index be6af18..75d62ff 100644 --- a/fs/f2fs/crypto.c +++ b/fs/f2fs/crypto.c @@ -112,7 +112,7 @@ struct f2fs_crypto_ctx *f2fs_get_crypto_ctx(struct inode *inode) struct f2fs_crypt_info *ci = F2FS_I(inode)->i_crypt_info; if (ci == NULL) - return ERR_PTR(-EACCES); + return ERR_PTR(-ENOKEY); /* * We first try getting the ctx from a free list because in @@ -457,8 +457,8 @@ int f2fs_decrypt_one(struct inode *inode, struct page *page) struct f2fs_crypto_ctx *ctx = f2fs_get_crypto_ctx(inode); int ret; - if (!ctx) - return -ENOMEM; + if (IS_ERR(ctx)) + return PTR_ERR(ctx); ret = f2fs_decrypt(ctx, page); f2fs_release_crypto_ctx(ctx); return ret; -- 2.1.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists