From patchwork Mon Mar 11 07:54:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1054199 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="Dj+93rYb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Hr3y0Cxcz9s4V for ; Mon, 11 Mar 2019 18:54:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726826AbfCKHyt (ORCPT ); Mon, 11 Mar 2019 03:54:49 -0400 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:59012 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725932AbfCKHyt (ORCPT ); Mon, 11 Mar 2019 03:54:49 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 796A69CC for ; Mon, 11 Mar 2019 07:54:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n2Cr4ZKNue5W for ; Mon, 11 Mar 2019 02:54:47 -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-p8.oit.umn.edu (Postfix) with ESMTPS id 4E81B9CB for ; Mon, 11 Mar 2019 02:54:47 -0500 (CDT) Received: by mail-io1-f69.google.com with SMTP id p143so3596854iod.19 for ; Mon, 11 Mar 2019 00:54:47 -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=Hu9tC1WSl8tGjIx7E+uA6syKbui28C0mvmzOxgNZjNo=; b=Dj+93rYb73Zn70wTR81Bm4QFAZKNfexSP1mhUE058/V4XLAJNvbQQqXVWmHNKA1bJq GGyU+rlG2Eia9S9UDHyxXK4uMTVk9QvHZDqZqHvh4CKXnlZRlInRNEjU4ZaMvbo6yXv/ dujngH9MaffKlochSn4d7yVX4xr3mf3SdKFgd8i3ALzzgrKjBRPwh9PPKEZ72IIDQoT5 ElwRaCgDvSg+o/DkSyDElA7btRsXFfk0R/6qRDaTLTNuepxazh/SVlCzpeoFcp7TpIx5 b2CJ3Ri/TzKUEeCys1P+6GUhuz4qbwDF3vFNC9s7PCiq7oO91j0zGcGw626kQYYnIqFa JCWg== 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=Hu9tC1WSl8tGjIx7E+uA6syKbui28C0mvmzOxgNZjNo=; b=DLX3snVRo7aCri8ey+Vf0U1E6EArAaHEhFSAfeIqViT6CmTvn0tgomVTFCrSlV5l4L GsFfZBjVOhl1rxEDMqG38XB7lsTIhR5iJD7fU6jfTmMN92qthtsWmG8gEiu+ZlfVcu3o Y70NWoAE7+VDLK4NlBjtwcxfW9SecP7wG3jO1J+42LSrgCTK5W5WYs0Dc0mNC2pw6B7q 77o8rluQrzw7zDGRX/HWSxZ1gh5/jPSeOQa8JYxXMc0j01V1v9UboU5JJHiApoXMLEUx W2K8NjKpRcWFU8f9AMb2rcPdhMJ13WwjaV/+pONeqsF3EPWRGYkDCQVMrHCd9hSLOs9X 1+TA== X-Gm-Message-State: APjAAAXzjb9dNDyYeOPUCZO5vYXB+y8sFUjJwL6K2DtiXqXzYc3PN9PU WoksVzL2RuilkyaYWzY4B7IzUkxEpO0FoO7qyiwrjZPmmSNs6qcB5MLaUES8vY83zQ2u5sUsfSY vIMwah6k+N5orMt/Zg2kZ X-Received: by 2002:a5d:8c85:: with SMTP id g5mr503614ion.195.1552290886891; Mon, 11 Mar 2019 00:54:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqziUDffAPz74NCA/DrX+4s1tCw5RM2Q2Twx1MaeiywzFQZtGY8OY7YcMckfQMVrEBm0Jl7pug== X-Received: by 2002:a5d:8c85:: with SMTP id g5mr503602ion.195.1552290886649; Mon, 11 Mar 2019 00:54:46 -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 f17sm7231879itb.36.2019.03.11.00.54.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 00:54:45 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Kalle Valo , "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: wireless: fix missing checks for ioremap Date: Mon, 11 Mar 2019 02:54:40 -0500 Message-Id: <20190311075440.1513-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 ioremap could fail and returns NULL. The fix actively checks its return value and handles potential failures. Signed-off-by: Kangjie Lu --- drivers/net/wireless/ray_cs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 44a943d18b84..cecd18a2f2de 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -394,6 +394,10 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->sram = ioremap(link->resource[2]->start, resource_size(link->resource[2])); + if (!local->sram) { + ret = -ENOMEM; + goto failed; + } /*** Set up 16k window for shared memory (receive buffer) ***************/ link->resource[3]->flags |= @@ -408,6 +412,10 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->rmem = ioremap(link->resource[3]->start, resource_size(link->resource[3])); + if (!local->rmem) { + ret = -ENOMEM; + goto failed; + } /*** Set up window for attribute memory ***********************************/ link->resource[4]->flags |= @@ -422,6 +430,10 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->amem = ioremap(link->resource[4]->start, resource_size(link->resource[4])); + if (!local->amem) { + ret = -ENOMEM; + goto failed; + } dev_dbg(&link->dev, "ray_config sram=%p\n", local->sram); dev_dbg(&link->dev, "ray_config rmem=%p\n", local->rmem);