Skip to content

Commit be85525

Browse files
Leon Romanovskygregkh
authored andcommitted
RDMA/mlx5: Fix multiple NULL-ptr deref errors in rereg_mr flow
commit b4bd701 upstream. Failure in rereg MR releases UMEM but leaves the MR to be destroyed by the user. As a result the following scenario may happen: "create MR -> rereg MR with failure -> call to rereg MR again" and hit "NULL-ptr deref or user memory access" errors. Ensure that rereg MR is only performed on a non-dead MR. Cc: syzkaller <syzkaller@googlegroups.com> Cc: <stable@vger.kernel.org> # 4.5 Fixes: 395a8e4 ("IB/mlx5: Refactoring register MR code") Reported-by: Noa Osherovich <noaos@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3ae1bf3 commit be85525

1 file changed

Lines changed: 23 additions & 9 deletions

File tree

  • drivers/infiniband/hw/mlx5

drivers/infiniband/hw/mlx5/mr.c

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -833,25 +833,28 @@ static int mr_umem_get(struct ib_pd *pd, u64 start, u64 length,
833833
int *order)
834834
{
835835
struct mlx5_ib_dev *dev = to_mdev(pd->device);
836+
struct ib_umem *u;
836837
int err;
837838

838-
*umem = ib_umem_get(pd->uobject->context, start, length,
839-
access_flags, 0);
840-
err = PTR_ERR_OR_ZERO(*umem);
839+
*umem = NULL;
840+
841+
u = ib_umem_get(pd->uobject->context, start, length, access_flags, 0);
842+
err = PTR_ERR_OR_ZERO(u);
841843
if (err) {
842-
*umem = NULL;
843-
mlx5_ib_err(dev, "umem get failed (%d)\n", err);
844+
mlx5_ib_dbg(dev, "umem get failed (%d)\n", err);
844845
return err;
845846
}
846847

847-
mlx5_ib_cont_pages(*umem, start, MLX5_MKEY_PAGE_SHIFT_MASK, npages,
848+
mlx5_ib_cont_pages(u, start, MLX5_MKEY_PAGE_SHIFT_MASK, npages,
848849
page_shift, ncont, order);
849850
if (!*npages) {
850851
mlx5_ib_warn(dev, "avoid zero region\n");
851-
ib_umem_release(*umem);
852+
ib_umem_release(u);
852853
return -EINVAL;
853854
}
854855

856+
*umem = u;
857+
855858
mlx5_ib_dbg(dev, "npages %d, ncont %d, order %d, page_shift %d\n",
856859
*npages, *ncont, *order, *page_shift);
857860

@@ -1340,27 +1343,38 @@ int mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,
13401343
int access_flags = flags & IB_MR_REREG_ACCESS ?
13411344
new_access_flags :
13421345
mr->access_flags;
1343-
u64 addr = (flags & IB_MR_REREG_TRANS) ? virt_addr : mr->umem->address;
1344-
u64 len = (flags & IB_MR_REREG_TRANS) ? length : mr->umem->length;
13451346
int page_shift = 0;
13461347
int upd_flags = 0;
13471348
int npages = 0;
13481349
int ncont = 0;
13491350
int order = 0;
1351+
u64 addr, len;
13501352
int err;
13511353

13521354
mlx5_ib_dbg(dev, "start 0x%llx, virt_addr 0x%llx, length 0x%llx, access_flags 0x%x\n",
13531355
start, virt_addr, length, access_flags);
13541356

13551357
atomic_sub(mr->npages, &dev->mdev->priv.reg_pages);
13561358

1359+
if (!mr->umem)
1360+
return -EINVAL;
1361+
1362+
if (flags & IB_MR_REREG_TRANS) {
1363+
addr = virt_addr;
1364+
len = length;
1365+
} else {
1366+
addr = mr->umem->address;
1367+
len = mr->umem->length;
1368+
}
1369+
13571370
if (flags != IB_MR_REREG_PD) {
13581371
/*
13591372
* Replace umem. This needs to be done whether or not UMR is
13601373
* used.
13611374
*/
13621375
flags |= IB_MR_REREG_TRANS;
13631376
ib_umem_release(mr->umem);
1377+
mr->umem = NULL;
13641378
err = mr_umem_get(pd, addr, len, access_flags, &mr->umem,
13651379
&npages, &page_shift, &ncont, &order);
13661380
if (err < 0) {

0 commit comments

Comments
 (0)