From patchwork Mon Mar 11 06:15:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1054147 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="AvDPgqvD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Hns32J6Qz9s3q for ; Mon, 11 Mar 2019 17:15:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726600AbfCKGPR (ORCPT ); Mon, 11 Mar 2019 02:15:17 -0400 Received: from mta-p5.oit.umn.edu ([134.84.196.205]:39866 "EHLO mta-p5.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726070AbfCKGPO (ORCPT ); Mon, 11 Mar 2019 02:15:14 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p5.oit.umn.edu (Postfix) with ESMTP id D46D798A for ; Mon, 11 Mar 2019 06:15:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p5.oit.umn.edu ([127.0.0.1]) by localhost (mta-p5.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tYSAjbPwbjiB for ; Mon, 11 Mar 2019 01:15:12 -0500 (CDT) Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p5.oit.umn.edu (Postfix) with ESMTPS id A01DC842 for ; Mon, 11 Mar 2019 01:15:12 -0500 (CDT) Received: by mail-io1-f69.google.com with SMTP id p17so3385985ios.8 for ; Sun, 10 Mar 2019 23:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=Y3kHNp6HzE/B4z4DcMOrdvPbKSVHL4QedcEUEsmr9mI=; b=AvDPgqvDFnPdwvaEsK7gaTz9W5Twres2goOsrheNf7ofxSdc84TsnXDjGX+G4utBl6 CYgeFuChvzo82XG5k2KCu1IjGsH/tSNkL++R+w8+hQfB/jF8CIeZbqnTTEI84YSoc3/X br7JhPic4D5f6wEAmnXW32uRLT3IWxf5KbJvCaR/WZLxD12gyE03QFbKF9Bh63tBAlkJ yFvtajRZyMtpDlgSAU1Hq417edPNafHWk68NUCmcml7MO2BleGYtUO/caGrO8VdLMtru Z9C51ypdRtxPVPyE9MlB5r7Eg+Mla8NTTq/Lszah5ElCpvYHlXX84wzKe2MIdofB2ElD 5biw== 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=Y3kHNp6HzE/B4z4DcMOrdvPbKSVHL4QedcEUEsmr9mI=; b=Cp1+hrEHuBxFohC68jdXqA3CnnXk/HPpl+l3o0Y1VfM2i+qMJ++mxLXu6LgR1wngE3 FOb0desdXYvdBh+M2zTmjP0CIaWFUvyLzoFmDvcSEarY9PaEo38KdS7l1CWhtcruII0+ 4vPLtDTETPdGmx5XIOCqlfMhn7FogRuLTF50VDByiciDkda53Dxh3Qfz+qSrGxiJ3oAM E7WuCB71950kq6HXZ7kbHulWkPYZcJrqxXpUFKihd0doELGj8OQ/vRgTAEJ+KENsW7I5 kJPdUsO5ouUSiv/wM8xhDz8UpjWTLxZRl5/v5+vDBKjQbSHYvcCCYN4pV0S2ASxauu78 7DtQ== X-Gm-Message-State: APjAAAUSPIuCnlz8V3+T0soY5C4CX7i5Vu4Y4H2Ls3FWQGrad7smZYmS s2jH/2clx6DoBCdMiysllkWVMtf/Ate50O+z9N/heQiQSrR8aYmWqiKd3qPcAmMPznTNyf1lbWb t1AkZiLDv34ZQSU30GsZF X-Received: by 2002:a5e:9741:: with SMTP id h1mr15761830ioq.87.1552284912260; Sun, 10 Mar 2019 23:15:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqzlAcMJo/1EGvCzOWVLdNLMG1hmAUbUkcOh0IH4JZmP0xlEDJSIEjXmna2XBxIgNbgCak8uSw== X-Received: by 2002:a5e:9741:: with SMTP id h1mr15761824ioq.87.1552284912022; Sun, 10 Mar 2019 23:15:12 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id a4sm7703964ita.41.2019.03.10.23.15.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 23:15:11 -0700 (PDT) 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: fujitsu: fix a potential NULL pointer dereference Date: Mon, 11 Mar 2019 01:15:01 -0500 Message-Id: <20190311061503.18181-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 -ENOMEM to avoid the NULL pointer dereference. Signed-off-by: Kangjie Lu --- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c index a69cd19a55ae..5061ddf699a7 100644 --- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c +++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c @@ -547,6 +547,9 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) return -1; base = ioremap(link->resource[2]->start, resource_size(link->resource[2])); + if (!base) + return -ENOMEM; + pcmcia_map_mem_page(link, link->resource[2], 0); /*