From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756639AbaIWTlZ (ORCPT ); Tue, 23 Sep 2014 15:41:25 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:46990 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753815AbaIWTlY (ORCPT ); Tue, 23 Sep 2014 15:41:24 -0400 From: Mark Einon To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, tklauser@distanz.ch, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Einon Subject: [PATCH 1/4] staging: et131x: zero allocation of fbr to prevent random address access Date: Tue, 23 Sep 2014 20:41:11 +0100 Message-Id: <1411501274-2970-1-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <20140923100106.GE4657@distanz.ch> References: <20140923100106.GE4657@distanz.ch> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Mark Einon --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Einon Subject: [PATCH 1/4] staging: et131x: zero allocation of fbr to prevent random address access Date: Tue, 23 Sep 2014 20:41:11 +0100 Message-ID: <1411501274-2970-1-git-send-email-mark.einon@gmail.com> References: <20140923100106.GE4657@distanz.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: devel@driverdev.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Einon To: gregkh@linuxfoundation.org Return-path: In-Reply-To: <20140923100106.GE4657@distanz.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" List-Id: netdev.vger.kernel.org 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 Signed-off-by: Mark Einon --- 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