src/patches/suse-2.6.27.31/patches.drivers/netxen-fix-memory-leak-in-drivers-net-netxen_nic_in.patch

   1 From 584dbe9475313e117abf9d2af88164edfd429c9a Mon Sep 17 00:00:00 2001
   2 From: =?utf-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
   3 Date: Thu, 29 Jan 2009 08:55:56 +0000
   4 Subject: netxen: fix memory leak in drivers/net/netxen_nic_init.c
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=utf-8
   7 Content-Transfer-Encoding: 8bit
   8 Acked-by: Karsten Keil <kkeil@novell.com>
   9 Reference: bnc#472416
  10
  11 For kernel bugzilla #12537:
  12 http://bugzilla.kernel.org/show_bug.cgi?id=12537
  13
  14 Free memory.
  15
  16 Signed-off-by: Daniel Marjamäki <danielm77@spray.se>
  17 Signed-off-by: David S. Miller <davem@davemloft.net>
  18 ---
  19  drivers/net/netxen/netxen_nic_init.c |    4 +++-
  20  1 files changed, 3 insertions(+), 1 deletions(-)
  21
  22 diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
  23 index ca7c8d8..ffd37be 100644
  24 --- a/drivers/net/netxen/netxen_nic_init.c
  25 +++ b/drivers/net/netxen/netxen_nic_init.c
  26 @@ -947,8 +947,10 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose)
  27         }
  28         for (i = 0; i < n; i++) {
  29                 if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 ||
  30 -               netxen_rom_fast_read(adapter, 8*i + 4*offset + 4, &addr) != 0)
  31 +               netxen_rom_fast_read(adapter, 8*i + 4*offset + 4, &addr) != 0) {
  32 +                       kfree(buf);
  33                         return -EIO;
  34 +               }
  35
  36                 buf[i].addr = addr;
  37                 buf[i].data = val;
  38 --
  39 1.5.6.4
  40