[PATCH 1/8] powerpc/nvram: Return directly after a failed parameter validation in dev_nvram_write()
flat view
STALE3573d
From: SF Markus Elfring <hidden>
Date: 2017-01-19 16:54:24
Also in:
kernel-janitors, lkml
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
From: Markus Elfring <redacted> Date: Thu, 19 Jan 2017 15:22:56 +0100 * Return directly after an inappropriate input parameter was detected. * Delete an initialisation for the variable "tmp" at the beginning and an assignment for the variable "ret" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <redacted> --- arch/powerpc/kernel/nvram_64.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 34d2c595de23..37d08b95c3f0 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c@@ -790,17 +790,15 @@ static ssize_t dev_nvram_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { ssize_t ret; - char *tmp = NULL; + char *tmp; ssize_t size; - ret = -ENODEV; if (!ppc_md.nvram_size) - goto out; + return -ENODEV; - ret = 0; size = ppc_md.nvram_size(); if (*ppos >= size || size < 0) - goto out; + return 0; count = min_t(size_t, count, size - *ppos); count = min(count, PAGE_SIZE);
--
2.11.0