From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:37723 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932437AbeGHVFr (ORCPT ); Sun, 8 Jul 2018 17:05:47 -0400 From: Eric Biggers To: David Howells , Alexander Viro , linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Eric Biggers Subject: [PATCH 17/18] fs_context: de-obfuscate command validation Date: Sun, 8 Jul 2018 14:01:53 -0700 Message-Id: <20180708210154.10423-18-ebiggers3@gmail.com> In-Reply-To: <20180708210154.10423-1-ebiggers3@gmail.com> References: <20180708210154.10423-1-ebiggers3@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Eric Biggers Signed-off-by: Eric Biggers --- fs/fsopen.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/fsopen.c b/fs/fsopen.c index dd38f6b65aace..34d7292bb398e 100644 --- a/fs/fsopen.c +++ b/fs/fsopen.c @@ -50,10 +50,10 @@ static ssize_t fscontext_write(struct file *file, case 'x': break; default: - goto err_bad_cmd; + return -EINVAL; } if (opt[1] != ' ') - goto err_bad_cmd; + return -EINVAL; data = memdup_user_nul(_buf + 2, len - 2); if (IS_ERR(data)) @@ -136,8 +136,7 @@ static ssize_t fscontext_write(struct file *file, err_free: kfree(data); return ret; -err_bad_cmd: - return -EINVAL; + wrong_phase: ret = -EBUSY; goto err_unlock; -- 2.18.0