From patchwork Tue May 12 18:30:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 6390341 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B5E28BEEE1 for ; Tue, 12 May 2015 18:35:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D10A520411 for ; Tue, 12 May 2015 18:35:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEFF320416 for ; Tue, 12 May 2015 18:35:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933466AbbELSf0 (ORCPT ); Tue, 12 May 2015 14:35:26 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:35188 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932924AbbELSfY (ORCPT ); Tue, 12 May 2015 14:35:24 -0400 Received: by pdbqd1 with SMTP id qd1so22656591pdb.2; Tue, 12 May 2015 11:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bb5e82pTMFN5d/DwtmDafxT+udglJEF69Kym/b61WFI=; b=n3JERuyZS+zvxzqQEcOvrtP54Veu3d+t5zsh4nmRdcrOHQJBudX/v2fqc5W7/DWyij A6ddeHfiz9o6YcsH5vjl3xaZhvswbWcYKbc9h6YwHzxYeHbYibeew7Jsqup541xrLCKA XPpd5oVVMG6AKwtRyyLtII+6knkhYgZtzAYaEIeSiNjIh0WwtsMKVJBVG6TCd3pPrOQT Pvzh69kpeazn0qQObRRD9jtYoyHIloN/S+gOUrSJMCjNSrroj7ogyGMPoYZ7jtGlkqnU Wy4Fg6XcKnwZI6yD+I7etW+h9D5cYk4q/SglA9+GbyPHbyzofH4FyuK496j7eY6jNTVf 6aSA== X-Received: by 10.70.42.139 with SMTP id o11mr30935516pdl.66.1431455723798; Tue, 12 May 2015 11:35:23 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id td3sm17026818pab.46.2015.05.12.11.35.21 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 12 May 2015 11:35:22 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Tue, 12 May 2015 11:33:13 -0700 From: "Luis R. Rodriguez" To: ming.lei@canonical.com, rusty@rustcorp.com.au Cc: dhowells@redhat.com, seth.forshee@canonical.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, pebolle@tiscali.nl, linux-wireless@vger.kernel.org, "Luis R. Rodriguez" , Kyle McMartin Subject: [PATCH v2 1/5] firmware: fix __getname() missing failure check Date: Tue, 12 May 2015 11:30:53 -0700 Message-Id: <1431455457-25322-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431455457-25322-1-git-send-email-mcgrof@do-not-panic.com> References: <1431455457-25322-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Luis R. Rodriguez" The request_firmware*() APIs uses __getname() to iterate over the list of paths possible for firmware to be found, the code however never checked for failure on __getname(). Although *very unlikely*, this can still happen. Add the missing check. There is still no checks on the concatenation of the path and filename passed, that requires a bit more work and subsequent patches address this. The commit that introduced this is abb139e7 ("firmware: teach the kernel to load firmware files directly from the filesystem"). mcgrof@ergon ~/linux (git::firmware-fixes) $ git describe --contains abb139e7 v3.7-rc1~120 Cc: Linus Torvalds Cc: Ming Lei Cc: Rusty Russell Cc: David Howells Cc: Kyle McMartin Signed-off-by: Luis R. Rodriguez --- drivers/base/firmware_class.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 171841a..bc6c8e6 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -322,7 +322,11 @@ static int fw_get_filesystem_firmware(struct device *device, { int i; int rc = -ENOENT; - char *path = __getname(); + char *path; + + path = __getname(); + if (unlikely(!path)) + return PTR_ERR(path); for (i = 0; i < ARRAY_SIZE(fw_path); i++) { struct file *file;