Skip to contentSkip to conversation

libnetlink: Fix memory leak in __rtnl_talk_iov()

PATCH Applied Gilad Naaman 2 participants 2 messages Dec 5, 2022 – Dec 9, 2022

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

PATCH 1/1 libnetlink: Fix memory leak in __rtnl_talk_iov()

From: Lahav Schlesinger <[email protected]>

If __rtnl_talk_iov fails then callers are not expected to free answer.

Currently if NLMSG_ERROR was received with an error then the netlink buffer was stored in answer, while still returning an error

This leak can be observed by running this snippet over time. This triggers an NLMSG_ERROR because for each neighbour update, ip will try to query for the name of interface 9999 in the wrong netns. (which in itself is a separate bug)

set -e

ip netns del test-a || true
ip netns add test-a
ip netns del test-b || true
ip netns add test-b

ip -n test-a netns set test-b auto
ip -n test-a link add veth_a index 9999 type veth \
peer name veth_b netns test-b
ip -n test-b link set veth_b up

ip -n test-a monitor link address prefix neigh nsid label all-nsid \

Quoted 1 line

/dev/null &

monitor_pid=$!
clean() {
kill $monitor_pid
ip netns del test-a
ip netns del test-b
}
trap clean EXIT

while true; do
ip -n test-b neigh add dev veth_b 1.2.3.4 lladdr AA:AA:AA:AA:AA:AA ip -n test-b neigh del dev veth_b 1.2.3.4
done

Fixes 55870dfe7f8b ("Improve batch and dump times by caching link lookups")
---
 lib/libnetlink.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
lib/libnetlink.c +11 -6
index 9af06232..001efc1d 100644
@@ -1092,14 +1092,19 @@ next:
 						rtnl_talk_error(h, err, errfn);
 				}
 
-				if (answer)
-					*answer = (struct nlmsghdr *)buf;
-				else
+				if (i < iovlen) {
 					free(buf);
-
-				if (i < iovlen)
 					goto next;
-				return error ? -i : 0;
+				}
+
+				if (error) {
+					free(buf);
+					return -i;
+				}
+
+				if (answer)
+					*answer = (struct nlmsghdr *)buf;
+				return 0;
 			}
 
 			if (answer) {
Signature · 1 line
2.37.1
#1 lore raw
This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:

Hello:

This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:

Quoted 8 lines · On Mon, 5 Dec 2022 10:47:41 +0200 you wrote:

From: Lahav Schlesinger <[email protected]>

If __rtnl_talk_iov fails then callers are not expected to free answer.

Currently if NLMSG_ERROR was received with an error then the netlink buffer was stored in answer, while still returning an error

[...]

Here is the summary with links:
- [iproute2] libnetlink: Fix memory leak in __rtnl_talk_iov()

    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=0faec4d050b6

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html