Prev: [PATCH 1/2] squashfs: xattr_handler don't inline
Next: [PATCH v2] Documentation/timers/hpet_example.c: only build on X86
From: David Howells on 1 Jun 2010 12:20
From: Denis Kirjanov <dkirjanov(a)hera.kernel.org>

Fix a possible null pointer dereference in afs_alloc_server(): the server
pointer is NULL if there was an allocation failure, and under such a
condition, we can't dereference it in the _leave() statement.

Signed-off-by: Denis Kirjanov <dkirjanov(a)kernel.org>
Signed-off-by: David Howells <dhowells(a)redhat.com>
---

fs/afs/server.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/afs/server.c b/fs/afs/server.c
index f490995..9fdc7fe 100644
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -91,9 +91,10 @@ static struct afs_server *afs_alloc_server(struct afs_cell *cell,

memcpy(&server->addr, addr, sizeof(struct in_addr));
server->addr.s_addr = addr->s_addr;
+ _leave(" = %p{%d}", server, atomic_read(&server->usage));
+ } else {
+ _leave(" = NULL [nomem]");
}
-
- _leave(" = %p{%d}", server, atomic_read(&server->usage));
return server;
}


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 1/2] squashfs: xattr_handler don't inline
Next: [PATCH v2] Documentation/timers/hpet_example.c: only build on X86