[PATCH 17/18] fs_context: de-obfuscate command validation

2018-07-08 Thread Eric Biggers
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



[PATCH 17/18] fs_context: de-obfuscate command validation

2018-07-08 Thread Eric Biggers
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