From patchwork Wed Aug 17 09:59:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Neukum X-Patchwork-Id: 660035 X-Patchwork-Delegate: davem@davemloft.net 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 3sDlHk6x8sz9t0G for ; Wed, 17 Aug 2016 20:06:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbcHQKGX (ORCPT ); Wed, 17 Aug 2016 06:06:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:52539 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751779AbcHQKGW (ORCPT ); Wed, 17 Aug 2016 06:06:22 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 60D23ABEF; Wed, 17 Aug 2016 10:06:20 +0000 (UTC) From: Oliver Neukum To: linux-usb@vger.kernel.org, netdev@vger.kernel.org, davem@davemloft.net, stern@rowland.harvard.edu Cc: Oliver Neukum Subject: [PATCH 2/2] kaweth: fix oops upon failed memory allocation Date: Wed, 17 Aug 2016 11:59:29 +0200 Message-Id: <1471427969-2355-2-git-send-email-oneukum@suse.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1471427969-2355-1-git-send-email-oneukum@suse.com> References: <1471427969-2355-1-git-send-email-oneukum@suse.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Just return an error upon failure. Signed-off-by: Oliver Neukum --- drivers/net/usb/kaweth.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 37bf715..3cd6906 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -1049,6 +1049,8 @@ 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) + return -ENOMEM; if ((result = kaweth_download_firmware(kaweth, "kaweth/new_code.bin", 100,