netdev - Re: [PATCH iproute2] libnetlink: check error handler is present before a call

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <54821a00-0dd1-da72-0445-63af284eb8b3@nvidia.com>
Date:   Sun, 11 Jul 2021 14:18:30 +0300
From:   Roi Dayan <roid@...dia.com>
To:     Alexander Mikhalitsyn <alexander.mikhalitsyn@...tuozzo.com>,
        <netdev@...r.kernel.org>
CC:     Stephen Hemminger <stephen@...workplumber.org>,
        Alexander Mikhalitsyn <alexander@...alicyn.com>
Subject: Re: [PATCH iproute2] libnetlink: check error handler is present
 before a call



On 2021-07-11 2:15 PM, Alexander Mikhalitsyn wrote:
> Fix nullptr dereference of errhndlr from rtnl_dump_filter_arg
> struct in rtnl_dump_done and rtnl_dump_error functions.
> 
> Fixes: 459ce6e3d792 ("ip route: ignore ENOENT during save if RT_TABLE_MAIN is being dumped")
> Cc: Stephen Hemminger <stephen@...workplumber.org>
> Cc: Roi Dayan <roid@...dia.com>
> Cc: Alexander Mikhalitsyn <alexander@...alicyn.com>
> Reported-by: Roi Dayan <roid@...dia.com>
> Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@...tuozzo.com>
> ---
>   lib/libnetlink.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/libnetlink.c b/lib/libnetlink.c
> index e9b8c3bd..d068dbe2 100644
> --- a/lib/libnetlink.c
> +++ b/lib/libnetlink.c
> @@ -686,7 +686,7 @@ static int rtnl_dump_done(struct nlmsghdr *h,
>   	if (len < 0) {
>   		errno = -len;
>   
> -		if (a->errhndlr(h, a->arg2) & RTNL_SUPPRESS_NLMSG_DONE_NLERR)
> +		if (a->errhndlr && (a->errhndlr(h, a->arg2) & RTNL_SUPPRESS_NLMSG_DONE_NLERR))
>   			return 0;
>   
>   		/* check for any messages returned from kernel */
> @@ -729,7 +729,7 @@ static int rtnl_dump_error(const struct rtnl_handle *rth,
>   		     errno == EOPNOTSUPP))
>   			return -1;
>   
> -		if (a->errhndlr(h, a->arg2) & RTNL_SUPPRESS_NLMSG_ERROR_NLERR)
> +		if (a->errhndlr && (a->errhndlr(h, a->arg2) & RTNL_SUPPRESS_NLMSG_ERROR_NLERR))
>   			return 0;
>   
>   		if (!(rth->flags & RTNL_HANDLE_F_SUPPRESS_NLERR))
> 

that was quick. was about to send the exact same patch :)
so tested as well. thanks!

Reviewed-by: Roi Dayan <roid@...dia.com>