From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3FA7C46463 for ; Wed, 1 Aug 2018 06:09:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D42F208A2 for ; Wed, 1 Aug 2018 06:09:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="A/c6gMsL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D42F208A2 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733250AbeHAHxt (ORCPT ); Wed, 1 Aug 2018 03:53:49 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:34056 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733090AbeHAHxt (ORCPT ); Wed, 1 Aug 2018 03:53:49 -0400 Received: by mail-pf1-f196.google.com with SMTP id k19-v6so7290332pfi.1 for ; Tue, 31 Jul 2018 23:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MKaP/zsQ/C9AJcu/cT5JowGOCZDXJ5vFUW/yzanzt98=; b=A/c6gMsLbsnGEkuqw8WWXkR+JVe+3224Ry7whkTAUwED5Io0yvkVcU2moVWuejXNz2 KceOk2G1XAWWR813xYJhgeLxv6sac8lrtfetkN4a/rxmcp4hZC0rdUGyg0bH3bNuyc5d EQPFRwL6+YAWvdhQoNB4AckGgQDzenWYID3tg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MKaP/zsQ/C9AJcu/cT5JowGOCZDXJ5vFUW/yzanzt98=; b=kxfnycmaGNyjpPjOTy65Lqix8pafKKeJOr5uphwhTHWExX7WkLVs9LKVaT3zmA/v6m u/m2QfYsax7DkBHnnTyQz6xOkkYlkjgJdcKQhWHClpH1LTfHIB5zlg4bMlm2jMyzWqfp rocKPskVfxzflgswoeZfYnSJsxcI39JfV5xYfM/8vXmtJ4DeW/xX7KB/4rqvgXKuLru8 Sly3kx+r4ASIEKyy9DgzjC4eX3thoU7JCdyNAGZf/DaPOClrrNV+nfyvVVvRTmc6C+Yi j45LOS/1KKyXxJMypitg2VjOT44D6iz8YPu/3leCglHzVM5x7GEzyFC+QOjrbZJDEWcw l7ug== X-Gm-Message-State: AOUpUlFsWAa62xbvlCkryY8tbP819QW/R3tZQsS5QmMuHH2pWaj6nrRU LRH4VsQiWrRNF76Npp5J5cACUg== X-Google-Smtp-Source: AAOMgpeu5y1TFl/5snJUKbTMbCYh+XvcT6/9oucwuptuDWc5ZRY34aiA9bZphlQKPGAtx+6zRFGIQw== X-Received: by 2002:a63:4306:: with SMTP id q6-v6mr22586380pga.181.1533103791865; Tue, 31 Jul 2018 23:09:51 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id q85-v6sm31433124pfa.151.2018.07.31.23.09.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Jul 2018 23:09:49 -0700 (PDT) From: Kees Cook To: Rasmus Villemoes Cc: Kees Cook , Leon Romanovsky , stable@vger.kernel.org, syzkaller , Jason Gunthorpe , Leon Romanovsky , Bart Van Assche , Doug Ledford , Dan Carpenter , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] RDMA/mlx5: Fix shift overflow in mlx5_ib_create_wq Date: Tue, 31 Jul 2018 23:09:47 -0700 Message-Id: <20180801060947.16670-4-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801060947.16670-1-keescook@chromium.org> References: <20180801060947.16670-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leon Romanovsky [ 61.182439] UBSAN: Undefined behaviour in drivers/infiniband/hw/mlx5/qp.c:5366:34 [ 61.183673] shift exponent 4294967288 is too large for 32-bit type 'unsigned int' [ 61.185530] CPU: 0 PID: 639 Comm: qp Not tainted 4.18.0-rc1-00037-g4aa1d69a9c60-dirty #96 [ 61.186981] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-2.fc27 04/01/2014 [ 61.188315] Call Trace: [ 61.188661] dump_stack+0xc7/0x13b [ 61.190427] ubsan_epilogue+0x9/0x49 [ 61.190899] __ubsan_handle_shift_out_of_bounds+0x1ea/0x22f [ 61.197040] mlx5_ib_create_wq+0x1c99/0x1d50 [ 61.206632] ib_uverbs_ex_create_wq+0x499/0x820 [ 61.213892] ib_uverbs_write+0x77e/0xae0 [ 61.248018] vfs_write+0x121/0x3b0 [ 61.249831] ksys_write+0xa1/0x120 [ 61.254024] do_syscall_64+0x7c/0x2a0 [ 61.256178] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 61.259211] RIP: 0033:0x7f54bab70e99 [ 61.262125] Code: 00 f3 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 [ 61.268678] RSP: 002b:00007ffe1541c318 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 61.271076] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f54bab70e99 [ 61.273795] RDX: 0000000000000070 RSI: 0000000020000240 RDI: 0000000000000003 [ 61.276982] RBP: 00007ffe1541c330 R08: 00000000200078e0 R09: 0000000000000002 [ 61.280035] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000004005c0 [ 61.283279] R13: 00007ffe1541c420 R14: 0000000000000000 R15: 0000000000000000 Cc: # 4.7 Fixes: 79b20a6c3014 ("IB/mlx5: Add receive Work Queue verbs") Cc: syzkaller Reported-by: Noa Osherovich Signed-off-by: Leon Romanovsky Signed-off-by: Kees Cook --- drivers/infiniband/hw/mlx5/qp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index a4f1f638509f..7fc156db643d 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -5365,7 +5365,10 @@ static int set_user_rq_size(struct mlx5_ib_dev *dev, rwq->wqe_count = ucmd->rq_wqe_count; rwq->wqe_shift = ucmd->rq_wqe_shift; - rwq->buf_size = (rwq->wqe_count << rwq->wqe_shift); + if (check_shift_overflow(rwq->wqe_count, rwq->wqe_shift, + &rwq->buf_size)) + return -EINVAL; + rwq->log_rq_stride = rwq->wqe_shift; rwq->log_rq_size = ilog2(rwq->wqe_count); return 0; -- 2.17.1