Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b49cae47 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Greg Kroah-Hartman
Browse files

IB/mlx4: Fix an error handling path in 'mlx4_ib_rereg_user_mr()' 



commit 3dc7c7badb7502ec3e3aa817a8bdd9e53aa54c52 upstream.

Before returning -EPERM we should release some resources, as already done
in the other error handling path of the function.

Fixes: d8f9cc328c88 ("IB/mlx4: Mark user MR as writable if actual virtual memory is writable")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db643130

drivers/infiniband/hw/mlx4/mr.c

+5 −2
Original line number Diff line number Diff line
@@ -246,8 +246,11 @@ int mlx4_ib_rereg_user_mr(struct ib_mr *mr, int flags, 
	}



	if (flags & IB_MR_REREG_ACCESS) {

		if (ib_access_writable(mr_access_flags) && !mmr->umem->writable)

			return -EPERM;

		if (ib_access_writable(mr_access_flags) &&

		    !mmr->umem->writable) {

			err = -EPERM;

			goto release_mpt_entry;

		}



		err = mlx4_mr_hw_change_access(dev->dev, *pmpt_entry,

					       convert_access(mr_access_flags));