Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2262336ybg; Sun, 27 Oct 2019 14:40:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwE5slnmASvF1Vvf104efYp7TZhuxKe4p+dByBnzjwBwYFY1/gtPlTPGeHWxkvYjEexBCQR X-Received: by 2002:a17:906:5e08:: with SMTP id n8mr13759242eju.20.1572212436519; Sun, 27 Oct 2019 14:40:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572212436; cv=none; d=google.com; s=arc-20160816; b=AiV7/RDCo1VNZB0zo0lAKtv4yhNUQKoamItIhLXrNNnSjH5jQTNlXol1yW+PH57zjh 5Fo5IKsUJsFuwc0QHT72/YXM708+P9VhhiBVsIc8VHfugj2TMa8Rr8W5J4cQe1tq24u2 +yyOEfgFMBkUpDDxBiVlCiWu4/vr6QtHS2hXaqiBrNytKxf5XK6IJJW6rRnLccv6Lx6X HxhhoZSYnuubb6KhIiQGtKc1f7ufg+vgbozQeD6cMQsRGYbuQmye97y+VFsOYXNlGRoB W7CO0JwlmlEyMjNG3XvB+IwElgNlwPeT/NH270WjsucbAtTQwhFn6QU/nyKotNj95ciJ JNNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+s7qBtS8odFJLuVBSjJiBFNYcLIH4xp+iMqZNJVmHKs=; b=Fey7SrKrZV1Tq6gsNSqtBgsuuKYSbtISByKbCRCPmwbWtx5JIqneqHSrcQOAe9TfRn Wzi8VGHYLfKvwfMG4/0W5kZvwGNH78kWhnHiKss5cXIAYtUAWH1zx50VJB8nhKwKUNP+ /wRO7A7NzONMZp9goKn7Fa28E+X9OlZ/rdLXXElx8LJczBRRV94LDJXJlKqG9b/Y6eAy HDNi2rKX4wFVc+gnP1KGLeWz72xE9zvM2k0zK2Xeh6hZ27KfIicHbQ5rfEMC8muiT6rT xRYogtlPmnibMCrrowZK+9qzd3JAWJqlysT4WxhkIIZg5f4EK5iywxfY8X5FXjD4UzeI J3Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Kaafw5P8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g28si6229121edg.327.2019.10.27.14.40.12; Sun, 27 Oct 2019 14:40:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Kaafw5P8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727949AbfJ0VGd (ORCPT + 99 others); Sun, 27 Oct 2019 17:06:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:52432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727716AbfJ0VGb (ORCPT ); Sun, 27 Oct 2019 17:06:31 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C0D4120873; Sun, 27 Oct 2019 21:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210390; bh=CFYqWASh+zwVBmqClQT5wi/Bqwf2yZuyfWW7zvxxAZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kaafw5P8D/jOPpSQe8fytuiBFFDASUsQ7tVXPmJYBgR/vAQ6opPBTsPlSNfVNKkpX CVwCtCCTxWRjwFNjQtE6DkqIq5WlbxgPB9ec8J5c4T9toxgHXcl1UTGmX1laP6H18L q+5SfRUT91QZrAGHFp0Evg0eMkAAYzETij11k/Tk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Waisman , Potnuri Bharat Teja , Jason Gunthorpe Subject: [PATCH 4.9 49/49] RDMA/cxgb4: Do not dma memory off of the stack Date: Sun, 27 Oct 2019 22:01:27 +0100 Message-Id: <20191027203208.381693146@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg KH commit 3840c5b78803b2b6cc1ff820100a74a092c40cbb upstream. Nicolas pointed out that the cxgb4 driver is doing dma off of the stack, which is generally considered a very bad thing. On some architectures it could be a security problem, but odds are none of them actually run this driver, so it's just a "normal" bug. Resolve this by allocating the memory for a message off of the heap instead of the stack. kmalloc() always will give us a proper memory location that DMA will work correctly from. Link: https://lore.kernel.org/r/20191001165611.GA3542072@kroah.com Reported-by: Nicolas Waisman Tested-by: Potnuri Bharat Teja Signed-off-by: Jason Gunthorpe Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/hw/cxgb4/mem.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) --- a/drivers/infiniband/hw/cxgb4/mem.c +++ b/drivers/infiniband/hw/cxgb4/mem.c @@ -264,13 +264,17 @@ static int write_tpt_entry(struct c4iw_r struct sk_buff *skb) { int err; - struct fw_ri_tpte tpt; + struct fw_ri_tpte *tpt; u32 stag_idx; static atomic_t key; if (c4iw_fatal_error(rdev)) return -EIO; + tpt = kmalloc(sizeof(*tpt), GFP_KERNEL); + if (!tpt) + return -ENOMEM; + stag_state = stag_state > 0; stag_idx = (*stag) >> 8; @@ -280,6 +284,7 @@ static int write_tpt_entry(struct c4iw_r mutex_lock(&rdev->stats.lock); rdev->stats.stag.fail++; mutex_unlock(&rdev->stats.lock); + kfree(tpt); return -ENOMEM; } mutex_lock(&rdev->stats.lock); @@ -294,28 +299,28 @@ static int write_tpt_entry(struct c4iw_r /* write TPT entry */ if (reset_tpt_entry) - memset(&tpt, 0, sizeof(tpt)); + memset(tpt, 0, sizeof(*tpt)); else { - tpt.valid_to_pdid = cpu_to_be32(FW_RI_TPTE_VALID_F | + tpt->valid_to_pdid = cpu_to_be32(FW_RI_TPTE_VALID_F | FW_RI_TPTE_STAGKEY_V((*stag & FW_RI_TPTE_STAGKEY_M)) | FW_RI_TPTE_STAGSTATE_V(stag_state) | FW_RI_TPTE_STAGTYPE_V(type) | FW_RI_TPTE_PDID_V(pdid)); - tpt.locread_to_qpid = cpu_to_be32(FW_RI_TPTE_PERM_V(perm) | + tpt->locread_to_qpid = cpu_to_be32(FW_RI_TPTE_PERM_V(perm) | (bind_enabled ? FW_RI_TPTE_MWBINDEN_F : 0) | FW_RI_TPTE_ADDRTYPE_V((zbva ? FW_RI_ZERO_BASED_TO : FW_RI_VA_BASED_TO))| FW_RI_TPTE_PS_V(page_size)); - tpt.nosnoop_pbladdr = !pbl_size ? 0 : cpu_to_be32( + tpt->nosnoop_pbladdr = !pbl_size ? 0 : cpu_to_be32( FW_RI_TPTE_PBLADDR_V(PBL_OFF(rdev, pbl_addr)>>3)); - tpt.len_lo = cpu_to_be32((u32)(len & 0xffffffffUL)); - tpt.va_hi = cpu_to_be32((u32)(to >> 32)); - tpt.va_lo_fbo = cpu_to_be32((u32)(to & 0xffffffffUL)); - tpt.dca_mwbcnt_pstag = cpu_to_be32(0); - tpt.len_hi = cpu_to_be32((u32)(len >> 32)); + tpt->len_lo = cpu_to_be32((u32)(len & 0xffffffffUL)); + tpt->va_hi = cpu_to_be32((u32)(to >> 32)); + tpt->va_lo_fbo = cpu_to_be32((u32)(to & 0xffffffffUL)); + tpt->dca_mwbcnt_pstag = cpu_to_be32(0); + tpt->len_hi = cpu_to_be32((u32)(len >> 32)); } err = write_adapter_mem(rdev, stag_idx + (rdev->lldi.vr->stag.start >> 5), - sizeof(tpt), &tpt, skb); + sizeof(*tpt), tpt, skb); if (reset_tpt_entry) { c4iw_put_resource(&rdev->resource.tpt_table, stag_idx); @@ -323,6 +328,7 @@ static int write_tpt_entry(struct c4iw_r rdev->stats.stag.cur -= 32; mutex_unlock(&rdev->stats.lock); } + kfree(tpt); return err; }