Skip to contentSkip to conversation

rpcb_clnt.c: memory leak in destroy_addr

PATCH In review Steve Dickson 1 participant 4 messages Aug 1, 2023 – Aug 7, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 rpcb_clnt.c: memory leak in destroy_addr

From: Herb Wartens <[email protected]>

Null pointers so they are not used again

---
 src/rpcb_clnt.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
src/rpcb_clnt.c +15 -5
index d178d86..c0a9e12 100644
@@ -104,17 +104,27 @@ destroy_addr(addr)
 {
 	if (addr == NULL)
 		return;
-	if(addr->ac_host != NULL)
+	if (addr->ac_host != NULL) {
 		free(addr->ac_host);
-	if(addr->ac_netid != NULL)
+		addr->ac_host = NULL;
+	}
+	if (addr->ac_netid != NULL) {
 		free(addr->ac_netid);
-	if(addr->ac_uaddr != NULL)
+		addr->ac_netid = NULL;
+	}
+	if (addr->ac_uaddr != NULL) {
 		free(addr->ac_uaddr);
-	if(addr->ac_taddr != NULL) {
-		if(addr->ac_taddr->buf != NULL)
+		addr->ac_uaddr = NULL;
+	}
+	if (addr->ac_taddr != NULL) {
+		if(addr->ac_taddr->buf != NULL) {
 			free(addr->ac_taddr->buf);
+			addr->ac_taddr->buf = NULL;
+		}
+		addr->ac_taddr = NULL;
 	}
 	free(addr);
+	addr = NULL;
 }
 
 /*
Signature · 1 line
2.41.0
#1 lore raw

PATCH 2/2 rpcb_clnt.c: Eliminate double frees in delete_cache()

From: Herb Wartens <[email protected]>

---
 src/rpcb_clnt.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
src/rpcb_clnt.c +6 -3
index c0a9e12..68fe69a 100644
@@ -262,12 +262,15 @@ delete_cache(addr)
 	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
 		if (!memcmp(cptr->ac_taddr->buf, addr->buf, addr->len)) {
 			/* Unlink from cache. We'll destroy it after releasing the mutex. */
-			if (cptr->ac_uaddr)
+			if (cptr->ac_uaddr) {
 				free(cptr->ac_uaddr);
-			if (prevptr)
+				cptr->ac_uaddr = NULL;
+			}
+			if (prevptr) {
 				prevptr->ac_next = cptr->ac_next;
-			else
+			} else {
 				front = cptr->ac_next;
+			}
 			cachesize--;
 			break;
 		}
Signature · 1 line
2.41.0
#2 lore raw

Re: [Libtirpc-devel] [PATCH 2/2] rpcb_clnt.c: Eliminate double frees in delete_cache()

Quoted 4 lines · Steve Dickson

From: Herb Wartens <[email protected]>

Committed... (tag: libtirpc-1-3-4-rc2)

steved

Quoted 27 lines
---
  src/rpcb_clnt.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
src/rpcb_clnt.c +6 -3
index c0a9e12..68fe69a 100644
@@ -262,12 +262,15 @@ delete_cache(addr)
  	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
  		if (!memcmp(cptr->ac_taddr->buf, addr->buf, addr->len)) {
  			/* Unlink from cache. We'll destroy it after releasing the mutex. */
-			if (cptr->ac_uaddr)
+			if (cptr->ac_uaddr) {
  				free(cptr->ac_uaddr);
-			if (prevptr)
+				cptr->ac_uaddr = NULL;
+			}
+			if (prevptr) {
  				prevptr->ac_next = cptr->ac_next;
-			else
+			} else {
  				front = cptr->ac_next;
+			}
  			cachesize--;
  			break;
  		}
#3 lore raw
In reply to Steve Dickson
Quoted 6 lines · Steve Dickson

From: Herb Wartens <[email protected]>

Null pointers so they are not used again

Committed... (tag: libtirpc-1-3-4-rc2)

steved

Quoted 41 lines
---
  src/rpcb_clnt.c | 20 +++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
src/rpcb_clnt.c +15 -5
index d178d86..c0a9e12 100644
@@ -104,17 +104,27 @@ destroy_addr(addr)
  {
  	if (addr == NULL)
  		return;
-	if(addr->ac_host != NULL)
+	if (addr->ac_host != NULL) {
  		free(addr->ac_host);
-	if(addr->ac_netid != NULL)
+		addr->ac_host = NULL;
+	}
+	if (addr->ac_netid != NULL) {
  		free(addr->ac_netid);
-	if(addr->ac_uaddr != NULL)
+		addr->ac_netid = NULL;
+	}
+	if (addr->ac_uaddr != NULL) {
  		free(addr->ac_uaddr);
-	if(addr->ac_taddr != NULL) {
-		if(addr->ac_taddr->buf != NULL)
+		addr->ac_uaddr = NULL;
+	}
+	if (addr->ac_taddr != NULL) {
+		if(addr->ac_taddr->buf != NULL) {
  			free(addr->ac_taddr->buf);
+			addr->ac_taddr->buf = NULL;
+		}
+		addr->ac_taddr = NULL;
  	}
  	free(addr);
+	addr = NULL;
  }
 
  /*