Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Message-ID: <5d9fed4f-ff87-cb14-3c7d-8899cb3e4370@gmail.com>
Date:   Fri, 1 Apr 2022 10:09:26 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.6.2
Subject: Re: [PATCH] net/ipv4: fix potential NULL dereference in
 sisfb_post_sis300()
Content-Language: en-US
To:     Haowen Bai <baihaowen@meizu.com>,
        "David S. Miller" <davem@davemloft.net>,
        Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
        David Ahern <dsahern@kernel.org>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
References: <1648785432-21824-1-git-send-email-baihaowen@meizu.com>
From:   Eric Dumazet <eric.dumazet@gmail.com>
In-Reply-To: <1648785432-21824-1-git-send-email-baihaowen@meizu.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk


On 3/31/22 20:57, Haowen Bai wrote:
> psin and psl could be null without checking null and return, so
> we need to dereference after checking.
>
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>
> ---
>   net/ipv4/igmp.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
> index 2ad3c7b..d400080 100644
> --- a/net/ipv4/igmp.c
> +++ b/net/ipv4/igmp.c
> @@ -2569,7 +2569,7 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
>   	    copy_to_user(optval, msf, IP_MSFILTER_SIZE(0))) {
>   		return -EFAULT;
>   	}
> -	if (len &&
> +	if (len && psl &&


len can not be !0 here if len was 0

psl = rtnl_dereference(pmc->sflist);

if (!psl) {

    count = 0;


->len == 0


>   	    copy_to_user(&optval->imsf_slist_flex[0], psl->sl_addr, len))
>   		return -EFAULT;
>   	return 0;
> @@ -2608,7 +2608,7 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
>   	count = psl ? psl->sl_count : 0;
>   	copycount = count < gsf->gf_numsrc ? count : gsf->gf_numsrc;
>   	gsf->gf_numsrc = count;
> -	for (i = 0; i < copycount; i++, p++) {
> +	for (i = 0; i < copycount && psin && psl; i++, p++) {
>   		struct sockaddr_storage ss;
>   
>   		psin = (struct sockaddr_in *)&ss;


Same here.