From patchwork Sun Mar 10 08:14:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1053921 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="gbWVThzw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44HDYy1Vthz9s9h for ; Sun, 10 Mar 2019 19:15:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726340AbfCJIPO (ORCPT ); Sun, 10 Mar 2019 04:15:14 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:42972 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725804AbfCJIPO (ORCPT ); Sun, 10 Mar 2019 04:15:14 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id DA767C4F for ; Sun, 10 Mar 2019 08:15:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bW-Ut6bToRbJ for ; Sun, 10 Mar 2019 03:15:12 -0500 (CDT) Received: from mail-it1-f200.google.com (mail-it1-f200.google.com [209.85.166.200]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id A60A6B69 for ; Sun, 10 Mar 2019 03:15:12 -0500 (CDT) Received: by mail-it1-f200.google.com with SMTP id 142so2174052itx.0 for ; Sun, 10 Mar 2019 00:15:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=sR+0KRmiIOct8yRErYNoAixuC5XPvKpQ/5YDnFmMUgM=; b=gbWVThzw59QbPRiQ4grseBbz1WwJaZmS1q/VXYIgQCmMDC5py2zVQdLvD2A6P/uOU8 2YlDaN0wmvblBJIG3q18kSYnSHVMChoak+xtlUYlvC6CB/htYYaXimP/vAmDl0rvKFBz uSYDVftkEWAAyepPHDNr2nmpwJFElvHesZkXT+/lfkZoOD+/RNvkt4LyJtiMUjznPVRq 96cYH1+O5G3uec8SPqt0CjhyQbKn3YHKTJ7DjRDPevfjkk5nBs1g0Fz2X0cQCzXT+1F8 zOOgFIBpa1+3S19a2AJcN2NPbAZE1eFekPxlbwv7mi7Lu/50Mtmp3ZR3xRv+NdhTKupU eN5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sR+0KRmiIOct8yRErYNoAixuC5XPvKpQ/5YDnFmMUgM=; b=H7Ns2K57OgkS69KqB1mRJ1axbqwJF0v7IgazEt+Yp80aYgZmcibY92WMn/UrnnJoUR uFpf5g7G5lFYY1wXGGoRvkIzUVxhpaV6oKf/Ida+PgMPDtB2iUdc5a8ypJg3rgCZwrSL 9P+/FtrnVGUyCvjAb0tHji2fX5TlGo7ayyy20zgscCysDL8Y68Pe0rr8o9mI0t/kgOdE E6anHxaIZ5TXDiIFUs/LcB0Ap4CzfynGbpVSt1mQ9u0/cw1Zwk2QNB2wGNhXrdHStENQ HZ1TTICrbNHB+8/X2c+YbeBkh+fBCl1AlDtrYIE+3Y1IvsGZmLfa7CLs/AckPAtbGyUM Ywng== X-Gm-Message-State: APjAAAWjtWfDC9w7OqKRQBw1p5ppnC30snC9aKzhGDXZrrt+pp2Jzdoh 2ptDolS4CJnlWALLwltZMkvpinDQc7JkGtI+IGOZzZ2mgUfvNF10qHe2ndjmLMGfqXSVs2qfXT5 7qHAugLYWD1KwR9MJ313M X-Received: by 2002:a02:b901:: with SMTP id v1mr7072960jan.13.1552205711874; Sun, 10 Mar 2019 00:15:11 -0800 (PST) X-Google-Smtp-Source: APXvYqwfj0oTWA3dA5cVBJN2dWkNEchzkMM9FLo2/Gw3FtjaGFBJ2mnMBPp6quButsmqj7yIf7dtCw== X-Received: by 2002:a02:b901:: with SMTP id v1mr7072951jan.13.1552205711610; Sun, 10 Mar 2019 00:15:11 -0800 (PST) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id o7sm938882ioh.87.2019.03.10.00.15.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 00:15:10 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: 8390: fix potential NULL pointer dereferences Date: Sun, 10 Mar 2019 03:14:53 -0500 Message-Id: <20190310081455.6097-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case ioremap fails, the fix returns to avoid NULL pointer dereferences. Signed-off-by: Kangjie Lu --- drivers/net/ethernet/8390/pcnet_cs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c index 61e43802b9a5..d82ecedf7366 100644 --- a/drivers/net/ethernet/8390/pcnet_cs.c +++ b/drivers/net/ethernet/8390/pcnet_cs.c @@ -289,6 +289,9 @@ static struct hw_info *get_hwinfo(struct pcmcia_device *link) virt = ioremap(link->resource[2]->start, resource_size(link->resource[2])); + if (unlikely(!virt)) + return NULL; + for (i = 0; i < NR_INFO; i++) { pcmcia_map_mem_page(link, link->resource[2], hw_info[i].offset & ~(resource_size(link->resource[2])-1)); @@ -1423,6 +1426,11 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, /* Try scribbling on the buffer */ info->base = ioremap(link->resource[3]->start, resource_size(link->resource[3])); + if (unlikely(!info->base)) { + ret = -ENOMEM; + goto failed; + } + for (i = 0; i < (TX_PAGES<<8); i += 2) __raw_writew((i>>1), info->base+offset+i); udelay(100);