Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Message-ID: <80014d58-48b0-928f-cc0c-dcfaa75e5975@linux.alibaba.com>
Date:   Thu, 23 Nov 2023 21:39:57 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.15.1
Subject: Re: [PATCH net-next 5/7] net/smc: compatible with 128-bits extend GID
 of virtual ISM device
To:     Simon Horman <horms@kernel.org>
Cc:     wintera@linux.ibm.com, wenjia@linux.ibm.com, hca@linux.ibm.com,
        gor@linux.ibm.com, agordeev@linux.ibm.com, davem@davemloft.net,
        edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
        kgraul@linux.ibm.com, jaka@linux.ibm.com,
        borntraeger@linux.ibm.com, svens@linux.ibm.com,
        alibuda@linux.alibaba.com, tonylu@linux.alibaba.com,
        raspl@linux.ibm.com, schnelle@linux.ibm.com,
        linux-s390@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <1700402277-93750-1-git-send-email-guwen@linux.alibaba.com>
 <1700402277-93750-6-git-send-email-guwen@linux.alibaba.com>
 <20231122190725.GB6731@kernel.org>
From:   Wen Gu <guwen@linux.alibaba.com>
In-Reply-To: <20231122190725.GB6731@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 2023/11/23 03:07, Simon Horman wrote:

> On Sun, Nov 19, 2023 at 09:57:55PM +0800, Wen Gu wrote:
>> According to virtual ISM support feature defined by SMCv2.1, GIDs of
>> virtual ISM device are UUIDs defined by RFC4122, which are 128-bits
>> long. So some adaptation work is required. And note that the GIDs of
>> existing platform firmware ISM devices still remain 64-bits long.
>>
>> Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
> 
> ...
> 
>> diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
> 
> ...
> 
>> @@ -1522,7 +1527,10 @@ void smc_smcd_terminate(struct smcd_dev *dev, u64 peer_gid, unsigned short vlan)
>>   	/* run common cleanup function and build free list */
>>   	spin_lock_bh(&dev->lgr_lock);
>>   	list_for_each_entry_safe(lgr, l, &dev->lgr_list, list) {
>> -		if ((!peer_gid || lgr->peer_gid == peer_gid) &&
>> +		if ((!peer_gid->gid ||
> 
> Hi Wen Gu,
> 
> Previously this condition assumed that peer could be NULL,
> and that is still the case in the next condition, a few lines down.
> But with this patch peer is unconditionally dereferenced here.
> 
> As flagged by Smatch.
> 

Hi Simon,

Good catch!

Previously the peer_gid is an u64 type variable and it will be checked if it is 0.

With this patch, peer_gid is an struct smcd_gid type pointer and the function that
calls smc_smcd_terminate will make sure it is not NULL. So it is safe here.

But there is indeed a problem here, see below.

>> +		     (lgr->peer_gid.gid == peer_gid->gid &&
>> +		      !smc_ism_is_virtual(dev) ? 1 :
>> +		      lgr->peer_gid.gid_ext == peer_gid->gid_ext)) &&
>>   		    (vlan == VLAN_VID_MASK || lgr->vlan_id == vlan)) {
>>   			if (peer_gid) /* peer triggered termination */

This if condition should be 'if (peer_gid->gid)'

I will fix this in the next version. Thank you very much.

Regards,
Wen Gu

>>   				lgr->peer_shutdown = 1;
> 
> ...