From patchwork Wed Sep 22 20:41:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Tettamanti X-Patchwork-Id: 65454 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CACD2B70DE for ; Thu, 23 Sep 2010 06:43:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755419Ab0IVUmo (ORCPT ); Wed, 22 Sep 2010 16:42:44 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:39045 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755204Ab0IVUmn (ORCPT ); Wed, 22 Sep 2010 16:42:43 -0400 Received: by wwb34 with SMTP id 34so16711wwb.1 for ; Wed, 22 Sep 2010 13:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=Ucb3Ithr7LQnqXtdFNVG32G7AdeDgTP7ofCOFG7mc9g=; b=oZLnQLVlDqtQNvIzL/Gt3AcImkODGwae31ZDFnXgkd5tqCapw9+lYr9nvZi3QHF8Yp 2aZ1w2eC0f8ppRugD9yVXqDiwgpbct6lkyHvbHJy4DJ3Ncv2AKDw5P0ifgURcck0nbkL Ld9phJp+du+CnDdfwtA7LN3v5BMSlkFGe3Wm8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=j/VjnsPIifvXNPdFqWDSbG/V343tXQSLOx7pUShGj8zYVOogRrYiCJcKskZ7vX/evm SfDAxdSoazgNR6URHl8yARgtlPC/2OHo5ct2YdJLzT0VVXd8nhlJ+ztDTfT0mtBxa4xg enFyjOKLNsg0+0hmf+hrXB8mr/vs3wG8tYOcg= Received: by 10.227.155.10 with SMTP id q10mr693789wbw.92.1285188125084; Wed, 22 Sep 2010 13:42:05 -0700 (PDT) Received: from nb-core2.darkstar.lan (dynamic-adsl-78-14-229-170.clienti.tiscali.it [78.14.229.170]) by mx.google.com with ESMTPS id b23sm8581846wbb.10.2010.09.22.13.42.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 22 Sep 2010 13:42:03 -0700 (PDT) Date: Wed, 22 Sep 2010 22:41:58 +0200 From: Luca Tettamanti To: netdev@vger.kernel.org Cc: atl1-devel@lists.sourceforge.net, jcliburn@gmail.com, chris.snook@gmail.com, jie.yang@atheros.com Subject: [PATCH 1/2] atl1: fix resume Message-ID: <20100922204158.GA1372@nb-core2.darkstar.lan> References: <20100922.132341.48506736.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100922.132341.48506736.davem@davemloft.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org adapter->cmb.cmb is initialized when the device is opened and freed when it's closed. Accessing it unconditionally during resume results either in a crash (NULL pointer dereference, when the interface has not been opened yet) or data corruption (when the interface has been used and brought down adapter->cmb.cmb points to a deallocated memory area). Cc: stable@kernel.org Signed-off-by: Luca Tettamanti Acked-by: Chris Snook --- This time with mutt :) drivers/net/atlx/atl1.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 63b9ba0..bbd6e30 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -2847,10 +2847,11 @@ static int atl1_resume(struct pci_dev *pdev) pci_enable_wake(pdev, PCI_D3cold, 0); atl1_reset_hw(&adapter->hw); - adapter->cmb.cmb->int_stats = 0; - if (netif_running(netdev)) + if (netif_running(netdev)) { + adapter->cmb.cmb->int_stats = 0; atl1_up(adapter); + } netif_device_attach(netdev); return 0;