netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Einon <mark.einon@gmail.com>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org, Mark Einon <mark.einon@gmail.com>
Subject: [PATCH 1/4] staging: et131x: zero allocation of fbr to prevent random address access
Date: Tue, 23 Sep 2014 20:41:11 +0100	[thread overview]
Message-ID: <1411501274-2970-1-git-send-email-mark.einon@gmail.com> (raw)
In-Reply-To: <20140923100106.GE4657@distanz.ch>

If et131x_rx_dma_memory_alloc() allocates rx_ring->fbr[0] but fails to
allocate rx_ring->fbr[1], this leaves fbr[0]->ring_virtaddr with the
possibility of being accessed in et131x_rx_dma_memory_free() as it
contains a random value, potentially causing an oops.

Fix this by zeroing the fbr memory on allocation. Subsequent frees of
this fbr memory explicitly zeros the ring_virtaddr value.

Reported-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
 drivers/staging/et131x/et131x.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 93afd61..2889f86 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -2003,10 +2003,10 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 	struct fbr_lookup *fbr;
 
 	/* Alloc memory for the lookup table */
-	rx_ring->fbr[0] = kmalloc(sizeof(*fbr), GFP_KERNEL);
+	rx_ring->fbr[0] = kzalloc(sizeof(*fbr), GFP_KERNEL);
 	if (rx_ring->fbr[0] == NULL)
 		return -ENOMEM;
-	rx_ring->fbr[1] = kmalloc(sizeof(*fbr), GFP_KERNEL);
+	rx_ring->fbr[1] = kzalloc(sizeof(*fbr), GFP_KERNEL);
 	if (rx_ring->fbr[1] == NULL)
 		return -ENOMEM;
 
-- 
2.1.0

  parent reply	other threads:[~2014-09-23 19:41 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-22 21:28 [RFC PATCH linux-next] et131x: Promote staging et131x driver to drivers/net Mark Einon
2014-09-22 23:56 ` Angus Gibson
2014-09-23  9:51   ` Mark Einon
2014-09-23  1:57 ` Joe Perches
2014-09-23  9:50   ` Mark Einon
2014-09-23  7:22 ` Tobias Klauser
2014-09-23  9:46   ` Mark Einon
2014-09-23 10:01     ` Tobias Klauser
2014-09-23 11:06       ` Mark Einon
2014-09-23 19:41       ` Mark Einon [this message]
2014-09-23 19:41         ` [PATCH 2/4] staging: et131x: don't cast a void* to a struct pointer Mark Einon
2014-09-23 19:41         ` [PATCH 3/4] staging: et131x: Add space after { in pci ID table Mark Einon
2014-09-23 19:41         ` [PATCH 4/4] staging: et131x: Remove unnecessary defines to enable driver PM Mark Einon
2014-09-23 19:02     ` [RFC PATCH linux-next] et131x: Promote staging et131x driver to drivers/net Francois Romieu
2014-09-23 19:17       ` Joe Perches
2014-09-23 20:07         ` Francois Romieu
2014-09-23 20:05 ` [PATCH v2] " Mark Einon
2014-09-23 21:07   ` Joe Perches
2014-09-24  8:54     ` [PATCH 1/4] staging: et131x: Use ether_addr_copy when copying ethernet addresses Mark Einon
2014-09-24  8:54       ` [PATCH 2/4] staging: et131x: Cat some lines less than 80 columns Mark Einon
2014-09-24  8:54       ` [PATCH 3/4] staging: et131x: Remove unnecessary OOM message Mark Einon
2014-09-24  8:54       ` [PATCH 4/4] staging: et131x: Remove unnecessary parentheses Mark Einon
2014-09-24  9:00     ` [PATCH v2] et131x: Promote staging et131x driver to drivers/net Mark Einon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411501274-2970-1-git-send-email-mark.einon@gmail.com \
    --to=mark.einon@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).