Skip to contentSkip to conversation

rds: Fix rds message leak in rds_message_map_pages

PATCH Applied Pavel Emelyanov 3 participants 3 messages Nov 8, 2010

Subsystems (3)
Networking Network drivers RDS - reliable datagram sockets
lore
Share & tools
lore

Pavel Emelyanov

author
#0 lore raw

PATCH 1/1 rds: Fix rds message leak in rds_message_map_pages

The sgs allocation error path leaks the allocated message.

Signed-off-by Pavel Emelyanov <[email protected]>

---

net/rds/message.c +3 -1
index 848cff4..1fd3d29 100644
@@ -249,8 +249,10 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in
 	rm->m_inc.i_hdr.h_len = cpu_to_be32(total_len);
 	rm->data.op_nents = ceil(total_len, PAGE_SIZE);
 	rm->data.op_sg = rds_message_alloc_sgs(rm, num_sgs);
-	if (!rm->data.op_sg)
+	if (!rm->data.op_sg) {
+		rds_message_put(rm);
 		return ERR_PTR(-ENOMEM);
+	}
 
 	for (i = 0; i < rm->data.op_nents; ++i) {
 		sg_set_page(&rm->data.op_sg[i],
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Pavel Emelyanov

The sgs allocation error path leaks the allocated message.

Signed-off-by Pavel Emelyanov<[email protected]>

---

net/rds/message.c +0 -0
index 848cff4..1fd3d29 100644
@@ -249,8 +249,10 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in
  	rm->m_inc.i_hdr.h_len = cpu_to_be32(total_len);

net/rds/message.c struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in · line 258

Quoted 10 lines
net/rds/message.c +3 -1
  	rm->data.op_nents = ceil(total_len, PAGE_SIZE);
  	rm->data.op_sg = rds_message_alloc_sgs(rm, num_sgs);
-	if (!rm->data.op_sg)
+	if (!rm->data.op_sg) {
+		rds_message_put(rm);
  		return ERR_PTR(-ENOMEM);
+	}
 
  	for (i = 0; i<  rm->data.op_nents; ++i) {
  		sg_set_page(&rm->data.op_sg[i],
Acked-by Andy Grover <[email protected]>

-- Andy