All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Zaborowski <andrew.zaborowski at intel.com>
To: ell at lists.01.org
Subject: [PATCH 2/5] icmp6: Free ra in icmp6_client_read_handler on ECANCELED
Date: Thu, 06 Jan 2022 16:05:26 +0100	[thread overview]
Message-ID: <20220106150529.458775-2-andrew.zaborowski@intel.com> (raw)
In-Reply-To: 20220106150529.458775-1-andrew.zaborowski@intel.com

[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]

Make sure we free @ra in in icmp6_client_read_handler even when
icmp6_client_handle_message returns -ECANCELED.

Fixes this:
==1088== 1,176 bytes in 9 blocks are definitely lost in loss record 28 of 29
==1088==    at 0x4843839: malloc (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
==1088==    by 0x4808A1: l_malloc (util.c:62)
==1088==    by 0x4C0966: icmp6_client_read_handler (icmp6.c:659)
==1088==    by 0x4877AF: io_callback (io.c:120)
==1088==    by 0x48693C: l_main_iterate (main.c:478)
==1088==    by 0x486A0B: l_main_run (main.c:525)
==1088==    by 0x486A0B: l_main_run (main.c:507)
==1088==    by 0x486C3F: l_main_run_with_signal (main.c:647)
==1088==    by 0x404755: main (main.c:532)
---
 ell/icmp6.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ell/icmp6.c b/ell/icmp6.c
index 6b1652c..87e46d1 100644
--- a/ell/icmp6.c
+++ b/ell/icmp6.c
@@ -401,9 +401,7 @@ static bool icmp6_client_read_handler(struct l_io *io, void *userdata)
 	}
 
 	r = icmp6_client_handle_message(client, ra, l, &src);
-	if (r == -ECANCELED)
-		return true;
-	else if (r < 0)
+	if (r < 0)
 		goto done;
 
 	/* Stop solicitations */
-- 
2.32.0

             reply	other threads:[~2022-01-06 15:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-06 15:05 Andrew Zaborowski [this message]
2022-01-06 18:58 [PATCH 2/5] icmp6: Free ra in icmp6_client_read_handler on ECANCELED Denis Kenzior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220106150529.458775-2-andrew.zaborowski@intel.com \
    --to=unknown@example.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.