]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
IB/umad: Return EIO in case of when device disassociated
authorShay Drory <shayd@nvidia.com>
Mon, 25 Jan 2021 12:13:38 +0000 (14:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Mar 2021 15:44:18 +0000 (16:44 +0100)
[ Upstream commit 4fc5461823c9cad547a9bdfbf17d13f0da0d6bb5 ]

MAD message received by the user has EINVAL error in all flows
including when the device is disassociated. That makes it impossible
for the applications to treat such flow differently.

Change it to return EIO, so the applications will be able to perform
disassociation recovery.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Link: https://lore.kernel.org/r/20210125121339.837518-2-leon@kernel.org
Signed-off-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/core/user_mad.c

index e9e75f40714cbff21964ff6c60faac54b4dfd70b..27bc51409f559c8f7f4f773e8b85e8011d7828d8 100644 (file)
@@ -342,6 +342,11 @@ static ssize_t ib_umad_read(struct file *filp, char __user *buf,
 
        mutex_lock(&file->mutex);
 
+       if (file->agents_dead) {
+               mutex_unlock(&file->mutex);
+               return -EIO;
+       }
+
        while (list_empty(&file->recv_list)) {
                mutex_unlock(&file->mutex);
 
@@ -484,7 +489,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
 
        agent = __get_agent(file, packet->mad.hdr.id);
        if (!agent) {
-               ret = -EINVAL;
+               ret = -EIO;
                goto err_up;
        }