From patchwork Tue Jul 25 20:07:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 108691 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp14396obm; Tue, 25 Jul 2017 13:07:58 -0700 (PDT) X-Received: by 10.98.8.86 with SMTP id c83mr20806462pfd.255.1501013278515; Tue, 25 Jul 2017 13:07:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501013278; cv=none; d=google.com; s=arc-20160816; b=hZuvBgkdoBCE0nvo5WSRr0UnymwJt/GkHXKk/wq8C6q9Wcv+YoR6zO5jlXWtAtR9nv YZlmGDrDSPCQVgLBQZYqvB6aZ2nX63q13lMLk9/WWKme4FtA8FXIcQa9E0BfR+O1Gbmk 3x5kA6I7o7flFGSc45hkdGVn+QaL+tNAly8ofJzONnhgG9Xngh3jOmJCUr+od4EPiIhr Tahu/Vj5e9Dgkj4zpcZQZQ4E3gXogpIc0Udd+u/o9Oh+1zMaMRTgyJumQBLbjabPEgsd kUcyFJ0UVXawcXwu+VFfN30oPk1FoOCJaoHeqqzhw/tA7Op1NMbHvSxFd7SRbnK2Ic5g /YDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=7un/uKNjJISJcHruJ191VB1eoldxoRlPjxBuk9XZlD8=; b=0PW0oh+gdcWvwjJlilmGmEtAjjlNWkzpOunBB/oi9SELD5VANx19e2Vdp+TDe4pvOu L3YZ+hDt6ROBIArcaUUtTntG9rjUEgWFwtSaeJjarz68OEDX2J9H0H1K5m6yGw05aLVO BkFFrP5gbXYbRlBbN5q/ZE8NllvtyzQbM/gtrCgaCD50En7tOO6ExP9Q3a1hgRvhYrIU tOR7pxlx7etR7GprxW+FlCzzGb7E16/Wxb+0B5RzUsU/e+bPN6J49wl9sDWZeF1wYu4g 1fXS+uUu83Y1nJMzgAS7YiNB9o86yqtXsCbS/PFOBghNpmFzq0t30lV5b+8EHY9nMD8r KFVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=WOxhzW5G; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h10si8970990plk.237.2017.07.25.13.07.58; Tue, 25 Jul 2017 13:07:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=WOxhzW5G; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753620AbdGYUHl (ORCPT + 6 others); Tue, 25 Jul 2017 16:07:41 -0400 Received: from mail-pg0-f44.google.com ([74.125.83.44]:34129 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752259AbdGYUHj (ORCPT ); Tue, 25 Jul 2017 16:07:39 -0400 Received: by mail-pg0-f44.google.com with SMTP id 123so74468087pgj.1 for ; Tue, 25 Jul 2017 13:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7un/uKNjJISJcHruJ191VB1eoldxoRlPjxBuk9XZlD8=; b=WOxhzW5GmZaG4Y/2qHJtrBOfvJGAvSS69bLTaLoA5DpvpVvvkPOs0cHtH2ZTvXKlQR y10baoPRCxf0pd/spM3eRvd2oahc7vl/w17iPmRWNkY9jw4nCrFeepQ07YEUoYVUY+VI IFmGVVxexJYK81tl7H7uXSCGy5b9DMKKr08jk= 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:in-reply-to :references; bh=7un/uKNjJISJcHruJ191VB1eoldxoRlPjxBuk9XZlD8=; b=gCBc3hNN4zAGvRZtu24EwsBtwU+vbrThQ0XpYBPYlVKj0qpmONktPrF0jbegxfRkZ/ f1E5DyFh7bB5NgdX+0ED6JfBL5MAQpU3HGT8ImKQKsdj8iry5nKf9vLa4JgzaeN2UU/Y nKOoLkM0KJ7x6LcrYyf5z3Epe9eCM1n6v5K55/R1FKLTHttF1PXrLDuBUts4LB7JNNyk reNz0d2lqgiVXT01xRaIN1FLtv7aQoZ2nQYUmO0kTMLMsayvAzVdqG5S1yMqtT/0NtCr aZoJE4RFAFNDy+G+6A/0fUGTrxUzGZ0mjtcgd+sFyBneHjyAP7KHWR9qZHdi1t7VVhQK oi4A== X-Gm-Message-State: AIVw113OorBnWv+4ANHPysAxkozi/XfAo9+1O6iIWXpvFUCgFk2nLxBa 1fJ4zckf+vZAspgW X-Received: by 10.84.229.130 with SMTP id c2mr22397320plk.215.1501013258776; Tue, 25 Jul 2017 13:07:38 -0700 (PDT) Received: from localhost.localdomain ([106.51.135.235]) by smtp.gmail.com with ESMTPSA id c76sm27684356pfj.91.2017.07.25.13.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 13:07:37 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , Oliver Neukum , "David S . Miller" Subject: [PATCH for-4.4 04/13] kaweth: fix oops upon failed memory allocation Date: Wed, 26 Jul 2017 01:37:12 +0530 Message-Id: <1501013241-31961-5-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501013241-31961-1-git-send-email-amit.pundir@linaro.org> References: <1501013241-31961-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Oliver Neukum commit 575ced7f8090c1a4e91e2daf8da9352a6a1fc7a7 upstream. Just return an error upon failure. Signed-off-by: Oliver Neukum Signed-off-by: David S. Miller Signed-off-by: Amit Pundir --- drivers/net/usb/kaweth.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 9f900eee27be..cd93220c9b45 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -1009,6 +1009,7 @@ static int kaweth_probe( struct net_device *netdev; const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; int result = 0; + int rv = -EIO; dev_dbg(dev, "Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x\n", @@ -1049,6 +1050,10 @@ static int kaweth_probe( /* Download the firmware */ dev_info(dev, "Downloading firmware...\n"); kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL); + if (!kaweth->firmware_buf) { + rv = -ENOMEM; + goto err_free_netdev; + } if ((result = kaweth_download_firmware(kaweth, "kaweth/new_code.bin", 100, @@ -1203,7 +1208,7 @@ err_only_tx: err_free_netdev: free_netdev(netdev); - return -EIO; + return rv; } /****************************************************************