* [PATCH] ipaddrlabel: Fix descriptor leak in flush_addrlabel()
@ 2024-02-07 20:25 Maks Mishin
2024-02-08 13:32 ` Donald Hunter
2024-02-08 16:56 ` Stephen Hemminger
0 siblings, 2 replies; 3+ messages in thread
From: Maks Mishin @ 2024-02-07 20:25 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Maks Mishin, netdev
Added closure of descriptor `rth2.fd` created by rtnl_open() when
returning from function.
Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
---
ip/ipaddrlabel.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c
index b045827a..3857fcf5 100644
--- a/ip/ipaddrlabel.c
+++ b/ip/ipaddrlabel.c
@@ -201,8 +201,10 @@ static int flush_addrlabel(struct nlmsghdr *n, void *arg)
n->nlmsg_type = RTM_DELADDRLABEL;
n->nlmsg_flags = NLM_F_REQUEST;
- if (rtnl_open(&rth2, 0) < 0)
+ if (rtnl_open(&rth2, 0) < 0) {
+ rtnl_close(&rth2);
return -1;
+ }
if (rtnl_talk(&rth2, n, NULL) < 0)
return -2;
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ipaddrlabel: Fix descriptor leak in flush_addrlabel()
2024-02-07 20:25 [PATCH] ipaddrlabel: Fix descriptor leak in flush_addrlabel() Maks Mishin
@ 2024-02-08 13:32 ` Donald Hunter
2024-02-08 16:56 ` Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Donald Hunter @ 2024-02-08 13:32 UTC (permalink / raw)
To: Maks Mishin; +Cc: Stephen Hemminger, netdev
Maks Mishin <maks.mishinfz@gmail.com> writes:
> Added closure of descriptor `rth2.fd` created by rtnl_open() when
> returning from function.
>
> Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
> ---
> ip/ipaddrlabel.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c
> index b045827a..3857fcf5 100644
> --- a/ip/ipaddrlabel.c
> +++ b/ip/ipaddrlabel.c
> @@ -201,8 +201,10 @@ static int flush_addrlabel(struct nlmsghdr *n, void *arg)
> n->nlmsg_type = RTM_DELADDRLABEL;
> n->nlmsg_flags = NLM_F_REQUEST;
>
> - if (rtnl_open(&rth2, 0) < 0)
> + if (rtnl_open(&rth2, 0) < 0) {
> + rtnl_close(&rth2);
This change is unnecessary. You're calling rtnl_close() in the case where
rtnl_open() just failed so there's nothing to close.
> return -1;
> + }
>
> if (rtnl_talk(&rth2, n, NULL) < 0)
> return -2;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ipaddrlabel: Fix descriptor leak in flush_addrlabel()
2024-02-07 20:25 [PATCH] ipaddrlabel: Fix descriptor leak in flush_addrlabel() Maks Mishin
2024-02-08 13:32 ` Donald Hunter
@ 2024-02-08 16:56 ` Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2024-02-08 16:56 UTC (permalink / raw)
To: Maks Mishin; +Cc: netdev
On Wed, 7 Feb 2024 23:25:42 +0300
Maks Mishin <maks.mishinfz@gmail.com> wrote:
> Added closure of descriptor `rth2.fd` created by rtnl_open() when
> returning from function.
>
> Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
> ---
> ip/ipaddrlabel.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c
> index b045827a..3857fcf5 100644
> --- a/ip/ipaddrlabel.c
> +++ b/ip/ipaddrlabel.c
> @@ -201,8 +201,10 @@ static int flush_addrlabel(struct nlmsghdr *n, void *arg)
> n->nlmsg_type = RTM_DELADDRLABEL;
> n->nlmsg_flags = NLM_F_REQUEST;
>
> - if (rtnl_open(&rth2, 0) < 0)
> + if (rtnl_open(&rth2, 0) < 0) {
> + rtnl_close(&rth2);
> return -1;
> + }
>
> if (rtnl_talk(&rth2, n, NULL) < 0)
> return -2;
This doesn't make sense, the error path in rtnl_open cleans up
itself. Do you have a reproducer or is this just some static analyzer?
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-08 16:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-07 20:25 [PATCH] ipaddrlabel: Fix descriptor leak in flush_addrlabel() Maks Mishin
2024-02-08 13:32 ` Donald Hunter
2024-02-08 16:56 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).