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  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [day] [month] [year] [list]
Date:   Thu,  9 Nov 2017 15:40:35 +0100
From:   "Ola N. Kaldestad" <mail@...l.no>
To:     keescook@...omium.org
Cc:     mcgrof@...nel.org, linux-kernel@...r.kernel.org,
        linux-fsdevel@...r.kernel.org, "Ola N. Kaldestad" <mail@...l.no>
Subject: [PATCH] Fix code-style warning

Removed unnecessary else block, and removed redundant return and call to kfree in if block.

Signed-off-by: Ola N. Kaldestad <mail@...l.no>
---
 kernel/sysctl.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index d9c31bc..87fbb3e 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -3089,14 +3089,12 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
 			else
 				bitmap_copy(bitmap, tmp_bitmap, bitmap_len);
 		}
-		kfree(tmp_bitmap);
 		*lenp -= left;
 		*ppos += *lenp;
-		return 0;
-	} else {
-		kfree(tmp_bitmap);
-		return err;
 	}
+
+	kfree(tmp_bitmap);
+	return err;
 }

 #else /* CONFIG_PROC_SYSCTL */
--
2.7.4

Powered by blists - more mailing lists