Skip to contentSkip to conversation

Fix leak in PNP interface code.

PATCH In review Dave Jones 1 participant 2 messages Sep 1, 2004 Pnp support

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

PATCH 1/1 Fix leak in PNP interface code.

Spotted with the source checker from Coverity.com.

drivers/pnp/interface.c +3 -1
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/pnp/interface.c linux-2.6/drivers/pnp/interface.c
@@ -244,8 +244,10 @@ static ssize_t pnp_show_current_resource
 				pnp_alloc(sizeof(pnp_info_buffer_t));
 	if (!buffer)
 		return -ENOMEM;
-	if (!dev)
+	if (!dev) {
+		kfree(buffer);
 		return -EINVAL;
+	}
 	buffer->len = PAGE_SIZE;
 	buffer->buffer = buf;
 	buffer->curr = buffer->buffer;
author
#1 lore raw
Quoted 11 lines · Dave Jones

Spotted with the source checker from Coverity.com.

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/pnp/interface.c linux-2.6/drivers/pnp/interface.c

drivers/pnp/interface.c +0 -0
@@ -244,8 +244,10 @@ static ssize_t pnp_show_current_resource
 				pnp_alloc(sizeof(pnp_info_buffer_t));
 	if (!buffer)

drivers/pnp/interface.c static ssize_t pnp_show_current_resource

Quoted 10 lines
drivers/pnp/interface.c +3 -2
 		return -ENOMEM;
-	if (!dev)
+	if (!dev) {
+		kfree(buffer);
 		return -EINVAL;
+	}
 	buffer->len = PAGE_SIZE;
 	buffer->buffer = buf;
 	buffer->curr = buffer->buffer;
-

Joe Perches pointed out that it may be better to just avoid the allocation completely if !dev, which makes perfect sense to me.

drivers/pnp/interface.c renamed from drivers/pnp/interface.c~ +6 -4
@@ -240,12 +240,14 @@
 {
 	struct pnp_dev *dev = to_pnp_dev(dmdev);
 	int i, ret;
-	pnp_info_buffer_t *buffer = (pnp_info_buffer_t *)
-				pnp_alloc(sizeof(pnp_info_buffer_t));
-	if (!buffer)
-		return -ENOMEM;
+	pnp_info_buffer_t *buffer;
+
 	if (!dev)
 		return -EINVAL;
+
+	buffer = (pnp_info_buffer_t *) pnp_alloc(sizeof(pnp_info_buffer_t));
+	if (!buffer)
+		return -ENOMEM;
 	buffer->len = PAGE_SIZE;
 	buffer->buffer = buf;
 	buffer->curr = buffer->buffer;