Skip to contentSkip to conversation

afs: fix possible null pointer dereference in afs_alloc_server

PATCH In review Denis Kirjanov 2 participants 2 messages May 30, 2010 – Jun 1, 2010 Afs filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 afs: fix possible null pointer dereference in afs_alloc_server

Fix possible null pointer dereference since kzalloc can return null

---
fs/afs/server.c | 5 ++++-

 1 files changed, 4 insertions(+), 1 deletions(-)
fs/afs/server.c +4 -1
index f490995..32e2a91 100644
@@ -93,7 +93,10 @@ static struct afs_server *afs_alloc_server(struct afs_cell *cell,
 		server->addr.s_addr = addr->s_addr;
 	}
 
-	_leave(" = %p{%d}", server, atomic_read(&server->usage));
+	if (likely(server))
+		_leave(" = %p{%d}", server, atomic_read(&server->usage));
+	else
+		_leave(" = -ENOMEM");
 	return server;
 }
 
maintainer
#1 lore raw
Quoted 1 line · Denis Kirjanov

Fix possible null pointer dereference since kzalloc can return null

This should really be merged into the preceding if-statement.

David