* [PATCH] cxgb4: do not dma memory off of the stack
@ 2019-10-01 15:39 Greg KH
2019-10-01 16:56 ` [PATCH v2] " Greg KH
2019-10-03 17:03 ` [PATCH] " Potnuri Bharat Teja
0 siblings, 2 replies; 4+ messages in thread
From: Greg KH @ 2019-10-01 15:39 UTC (permalink / raw)
To: Potnuri Bharat Teja, Doug Ledford, Jason Gunthorpe
Cc: linux-rdma, linux-kernel, Nicolas Waisman
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.
Reported-by: Nicolas Waisman <nico@semmle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
Note, test-built only, I don't have this hardware to actually run this
code at all.
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index aa772ee0706f..b2bd3de81dcd 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -275,13 +275,17 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
struct sk_buff *skb, struct c4iw_wr_wait *wr_waitp)
{
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;
@@ -305,28 +309,28 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
/* 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, wr_waitp);
+ sizeof(*tpt), tpt, skb, wr_waitp);
if (reset_tpt_entry) {
c4iw_put_resource(&rdev->resource.tpt_table, stag_idx);
@@ -334,6 +338,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
rdev->stats.stag.cur -= 32;
mutex_unlock(&rdev->stats.lock);
}
+ kfree(tpt);
return err;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] cxgb4: do not dma memory off of the stack
2019-10-01 15:39 [PATCH] cxgb4: do not dma memory off of the stack Greg KH
@ 2019-10-01 16:56 ` Greg KH
2019-10-04 18:16 ` Jason Gunthorpe
2019-10-03 17:03 ` [PATCH] " Potnuri Bharat Teja
1 sibling, 1 reply; 4+ messages in thread
From: Greg KH @ 2019-10-01 16:56 UTC (permalink / raw)
To: Potnuri Bharat Teja, Doug Ledford, Jason Gunthorpe
Cc: linux-rdma, linux-kernel, Nicolas Waisman
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.
Reported-by: Nicolas Waisman <nico@semmle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
v2: clean up memory on error case, pointed out by Nicolas
v1: https://lore.kernel.org/r/20191001153917.GA3498459@kroah.com
Test-built only, I don't have this hardware to actually run this
code at all.
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index aa772ee0706f..35c284af574d 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -275,13 +275,17 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
struct sk_buff *skb, struct c4iw_wr_wait *wr_waitp)
{
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;
@@ -291,6 +295,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
mutex_lock(&rdev->stats.lock);
rdev->stats.stag.fail++;
mutex_unlock(&rdev->stats.lock);
+ kfree(tpt);
return -ENOMEM;
}
mutex_lock(&rdev->stats.lock);
@@ -305,28 +310,28 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
/* 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, wr_waitp);
+ sizeof(*tpt), tpt, skb, wr_waitp);
if (reset_tpt_entry) {
c4iw_put_resource(&rdev->resource.tpt_table, stag_idx);
@@ -334,6 +339,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
rdev->stats.stag.cur -= 32;
mutex_unlock(&rdev->stats.lock);
}
+ kfree(tpt);
return err;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] cxgb4: do not dma memory off of the stack
2019-10-01 15:39 [PATCH] cxgb4: do not dma memory off of the stack Greg KH
2019-10-01 16:56 ` [PATCH v2] " Greg KH
@ 2019-10-03 17:03 ` Potnuri Bharat Teja
1 sibling, 0 replies; 4+ messages in thread
From: Potnuri Bharat Teja @ 2019-10-03 17:03 UTC (permalink / raw)
To: Greg KH
Cc: Doug Ledford, Jason Gunthorpe, linux-rdma, linux-kernel, Nicolas Waisman
On Tuesday, October 10/01/19, 2019 at 21:09:17 +0530, Greg KH wrote:
> 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.
>
> Reported-by: Nicolas Waisman <nico@semmle.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
>
> Note, test-built only, I don't have this hardware to actually run this
> code at all.
Thanks for the patch.
Tests with HW ran fine.
Tested-by: Potnuri Bharat Teja <bharat@chelsio.com>
>
> diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
> index aa772ee0706f..b2bd3de81dcd 100644
> --- a/drivers/infiniband/hw/cxgb4/mem.c
> +++ b/drivers/infiniband/hw/cxgb4/mem.c
> @@ -275,13 +275,17 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
> struct sk_buff *skb, struct c4iw_wr_wait *wr_waitp)
> {
> 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;
>
> @@ -305,28 +309,28 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
>
> /* 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, wr_waitp);
> + sizeof(*tpt), tpt, skb, wr_waitp);
>
> if (reset_tpt_entry) {
> c4iw_put_resource(&rdev->resource.tpt_table, stag_idx);
> @@ -334,6 +338,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
> rdev->stats.stag.cur -= 32;
> mutex_unlock(&rdev->stats.lock);
> }
> + kfree(tpt);
> return err;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] cxgb4: do not dma memory off of the stack
2019-10-01 16:56 ` [PATCH v2] " Greg KH
@ 2019-10-04 18:16 ` Jason Gunthorpe
0 siblings, 0 replies; 4+ messages in thread
From: Jason Gunthorpe @ 2019-10-04 18:16 UTC (permalink / raw)
To: Greg KH
Cc: Potnuri Bharat Teja, Doug Ledford, linux-rdma, linux-kernel,
Nicolas Waisman
On Tue, Oct 01, 2019 at 06:56:11PM +0200, Greg KH wrote:
> 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.
>
> Reported-by: Nicolas Waisman <nico@semmle.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Applied to for-rc, thanks
Jason
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-04 18:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-01 15:39 [PATCH] cxgb4: do not dma memory off of the stack Greg KH
2019-10-01 16:56 ` [PATCH v2] " Greg KH
2019-10-04 18:16 ` Jason Gunthorpe
2019-10-03 17:03 ` [PATCH] " Potnuri Bharat Teja
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).