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@xxxxxxxxxxxxxxxxx>
...
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;
...
