login
Header Space

 
 

Re: [PATCH 2/4] kernel: fix integer as NULL pointer warnings

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Harvey Harrison <harvey.harrison@...>
Cc: <torvalds@...>, <viro@...>, <linux-kernel@...>, Andrew Morton <akpm@...>
Date: Monday, April 28, 2008 - 6:31 pm

Harvey wrote:
=============

kernel/cpuset.c:1268:52: warning: Using plain integer as NULL pointer
kernel/pid_namespace.c:95:24: warning: Using plain integer as NULL pointer

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 kernel/cpuset.c        |    3 ++-
 kernel/pid_namespace.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 024888b..48a976c 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1265,7 +1265,8 @@ static ssize_t cpuset_common_file_write(struct cgroup *cont,
 		return -E2BIG;
 
 	/* +1 for nul-terminator */
-	if ((buffer = kmalloc(nbytes + 1, GFP_KERNEL)) == 0)
+	buffer = kmalloc(nbytes + 1, GFP_KERNEL);
+	if (!buffer)
 		return -ENOMEM;
 
 	if (copy_from_user(buffer, userbuf, nbytes)) {
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 6d792b6..5ca37fa 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -92,7 +92,7 @@ static struct pid_namespace *create_pid_namespace(int level)
 	atomic_set(&ns->pidmap[0].nr_free, BITS_PER_PAGE - 1);
 
 	for (i = 1; i < PIDMAP_ENTRIES; i++) {
-		ns->pidmap[i].page = 0;
+		ns->pidmap[i].page = NULL;
 		atomic_set(&ns->pidmap[i].nr_free, BITS_PER_PAGE);
 	}
 

=========
Looks ok.

kernel/cpuset.c changes usually go through Andrew Morton's *-mm tree,
where they can be sequenced and (the frequent ;) collisions resolved.
So I added him to the CC list.

Reviewed-by: Paul Jackson <pj@sgi.com>

-- 
                  I won't rest till it's the best ...
                  Programmer, Linux Scalability
                  Paul Jackson <pj@sgi.com> 1.940.382.4214
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 2/4] kernel: fix integer as NULL pointer warnings, Harvey Harrison, (Mon Apr 28, 5:13 pm)
Re: [PATCH 2/4] kernel: fix integer as NULL pointer warnings, Paul Jackson, (Mon Apr 28, 6:31 pm)
speck-geostationary