]> git.itanic.dy.fi Git - linux-stable/commitdiff
RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device
authorRoland Dreier <roland@purestorage.com>
Tue, 3 Apr 2018 22:33:01 +0000 (15:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2018 07:36:31 +0000 (09:36 +0200)
commit 8435168d50e66fa5eae01852769d20a36f9e5e83 upstream.

Check to make sure that ctx->cm_id->device is set before we use it.
Otherwise userspace can trigger a NULL dereference by doing
RDMA_USER_CM_CMD_SET_OPTION on an ID that is not bound to a device.

Cc: <stable@vger.kernel.org>
Reported-by: <syzbot+a67bc93e14682d92fc2f@syzkaller.appspotmail.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/infiniband/core/ucma.c

index d6fa38f8604f27a74c4ed25086f4e800eaa90358..0698d92e265665b2643c24230470c61912a2b47d 100644 (file)
@@ -1241,6 +1241,9 @@ static int ucma_set_ib_path(struct ucma_context *ctx,
        if (!optlen)
                return -EINVAL;
 
+       if (!ctx->cm_id->device)
+               return -EINVAL;
+
        memset(&sa_path, 0, sizeof(sa_path));
 
        sa_path.rec_type = SA_PATH_REC_TYPE_IB;