linux-kernel - [PATCH] Remove some pointless conditionals before kfree() in kernel/cgroup.c

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.0902222254350.1236@swampdragon.chaosbits.net>
Date:	Sun, 22 Feb 2009 23:05:48 +0100 (CET)
From:	Jesper Juhl <jj@...osbits.net>
To:	linux-kernel@...r.kernel.org
cc:	Stephen Hemminger <shemminger@...ux-foundation.org>,
	Paul Jackson <pj@....com>, Simon Derr <simon.derr@...l.net>,
	Paul Menage <menage@...gle.com>, Jesper Juhl <jj@...osbits.net>
Subject: [PATCH] Remove some pointless conditionals before kfree() in
 kernel/cgroup.c

Hi,

Here's a small patch for kernel/cgroup.c

Removes a few pointless tests of pointer == 0 before kfree() in 
kernel/cgroup.c.
If the pointer we hand to kfree() is 0, then kfree() is a noop, so there 
is no need to test.

Reduces object file size a bit : 

Before:
$ size kernel/cgroup.o
   text    data     bss     dec     hex filename
  21593    7804    4924   34321    8611 kernel/cgroup.o
After:
$ size kernel/cgroup.o
   text    data     bss     dec     hex filename
  21537    7744    4924   34205    859d kernel/cgroup.o

and source file size shrinks a bit too - always nice.


Signed-off-by: Jesper Juhl <jj@...osbits.net>
---

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 9edb5c4..1c0a9b5 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -865,8 +865,7 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
 	if (opts.release_agent)
 		strcpy(root->release_agent_path, opts.release_agent);
  out_unlock:
-	if (opts.release_agent)
-		kfree(opts.release_agent);
+	kfree(opts.release_agent);
 	mutex_unlock(&cgroup_mutex);
 	mutex_unlock(&cgrp->dentry->d_inode->i_mutex);
 	return ret;
@@ -969,15 +968,13 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
 	/* First find the desired set of subsystems */
 	ret = parse_cgroupfs_options(data, &opts);
 	if (ret) {
-		if (opts.release_agent)
-			kfree(opts.release_agent);
+		kfree(opts.release_agent);
 		return ret;
 	}
 
 	root = kzalloc(sizeof(*root), GFP_KERNEL);
 	if (!root) {
-		if (opts.release_agent)
-			kfree(opts.release_agent);
+		kfree(opts.release_agent);
 		return -ENOMEM;
 	}
 


-- 
Jesper Juhl <jj@...osbits.net>             http://www.chaosbits.net/
Plain text mails only, please      http://www.expita.com/nomime.html
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html

--
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/