From patchwork Sat Sep 12 03:19:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 33518 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id B3B80B7B5F for ; Sat, 12 Sep 2009 13:24:02 +1000 (EST) Received: by ozlabs.org (Postfix) id 9EDE8DDDD4; Sat, 12 Sep 2009 13:24:02 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 3946CDDDD3 for ; Sat, 12 Sep 2009 13:24:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757234AbZILDXo (ORCPT ); Fri, 11 Sep 2009 23:23:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753681AbZILDXo (ORCPT ); Fri, 11 Sep 2009 23:23:44 -0400 Received: from mail-px0-f189.google.com ([209.85.216.189]:42435 "EHLO mail-px0-f189.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753457AbZILDXn (ORCPT ); Fri, 11 Sep 2009 23:23:43 -0400 Received: by pxi27 with SMTP id 27so1212317pxi.15 for ; Fri, 11 Sep 2009 20:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=w5Hwo4naTBplgSRy7azD5RkeC+RW9O1rx8RBWZ0SCR0=; b=BxKbPSpqAXqZOjucWdvBZX2fP4OPgpWPOfb6j6tiQ1+zXLW2oKW0dx1YYgxUVnI9sc Ts6nIJAZNdNSsv5jzIt63M+RxPMNgkP2v2497PQ0yx9GksNdzxfw+0Z5G5pvZCUXbjJg MVNJTbIRg9mvNYjZ6zAslqIl7Z9nmka/31JJg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=Od/yyAK3FJmEXoW3pd35rJ2xV4U9G73hiwM6KRAYeZhzDxvncrSZHp/EisssayS23E b0Ie9LXqtr8OCwAzBZt+ccsFqprHJ9DcOc+jNUNXOVRhqtLYp5v9b3NRgkqiW0qS9csc 21oq42je+3NCMByu+aeunr0gWLeGCqusSeDsw= Received: by 10.115.117.13 with SMTP id u13mr6751789wam.150.1252725826580; Fri, 11 Sep 2009 20:23:46 -0700 (PDT) Received: from ?192.168.0.100? ([121.168.21.96]) by mx.google.com with ESMTPS id 20sm1567311pxi.12.2009.09.11.20.23.44 (version=SSLv3 cipher=RC4-MD5); Fri, 11 Sep 2009 20:23:45 -0700 (PDT) Message-ID: <4AAB133B.8070900@ring3k.org> Date: Sat, 12 Sep 2009 12:19:23 +0900 From: Mike McCormack User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090706) MIME-Version: 1.0 To: Stephen Hemminger CC: netdev@vger.kernel.org Subject: [PATCH] sky2: Make hw->ports the number of ports allocated Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If allocation of the second ports fails, make sure that hw->ports is not 2 otherwise we'll crash trying to access the second port. Signed-off-by: Mike McCormack --- drivers/net/sky2.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 018aa58..c17ee26 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -4563,6 +4563,10 @@ static int __devinit sky2_probe(struct pci_dev *pdev, free_netdev(dev1); } else sky2_show_addr(dev1); + + /* couldn't allocate the second port */ + if (!hw->dev[1]) + --hw->ports; } setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw);