From patchwork Wed Nov 8 19:54:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 118332 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp54995edl; Wed, 8 Nov 2017 11:54:28 -0800 (PST) X-Google-Smtp-Source: ABhQp+Re4kHFcjKTEMvYmliBhAITAVzSNaxV735WtjmbKHwLrTRdujGaVFHC0v+aAdGKysnF49AX X-Received: by 10.84.142.131 with SMTP id 3mr1429224plx.26.1510170868305; Wed, 08 Nov 2017 11:54:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510170868; cv=none; d=google.com; s=arc-20160816; b=zDlvMTiInmxtQamz/1e0Vyy3dA7R92wUine9BDBwdChm+DTslLqF21IG7sL0R5YhR8 3RiHUJMkLC8UIaCfC1JSUDsZtBB4m7PCGcsOOw+p1WDhRroId/Ldul0W6TJML/+3neCg rKf13CU4Bh/01a/xiFXO9lf+2aV4QaXDc59pxgtA8jx1j1q4dMWFQtmeiIOe6VOT6qLI u07RVonCWujiXMjqgv3cJJ/Hmm06hCkpgTeeRFm2aAqFgRiebGgM3hKhWCWJocQv5nNl LH/N3vWp7MU90fSNONdoGc7ExESxXyfbFliTxn12lWBzougD03ZD2D0A/XO5UqB43don AyuA== 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=LVAq5AWaYJHDixhW1FXa5cCKQAyAXegpMPLi7i2CN/U=; b=h4fJdO8DPVBYkIlnRToVTCEDNfjiT2NKMaHgM+2yEp0BaAsjLXElpgL6Je+qoPceIu pFByzFI8Hk+/PrcvAfIhlvI7qJR5lCRPmjPk83I9bdwaVBeXo65a1vjl0kj5AdYWkhTM jvFY+jrLSWqB5RaRQ2thLlaHU2Px926jz/abfl780CyroqA0qtrYDjRzhaosuVb46pcQ 3lUBacnBo5C5eahqBTQdF3LS3nT6G7tI6HyqSbplemLgBqSLvQfYZXKhT0knuj//c8tz 0V4n1crbykgIsq7MNx0ORYfSCZE5G5cuPjskhEMAxBrgUzrZ6p84kwiIB9Ww4PfSjhMT jYpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jT7QQHUM; 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 f5si4413061plo.19.2017.11.08.11.54.28; Wed, 08 Nov 2017 11:54:28 -0800 (PST) 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.s=google header.b=jT7QQHUM; 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 S1752559AbdKHTy0 (ORCPT + 9 others); Wed, 8 Nov 2017 14:54:26 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:52795 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751749AbdKHTyX (ORCPT ); Wed, 8 Nov 2017 14:54:23 -0500 Received: by mail-pf0-f193.google.com with SMTP id e64so2487028pfk.9 for ; Wed, 08 Nov 2017 11:54:23 -0800 (PST) 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=LVAq5AWaYJHDixhW1FXa5cCKQAyAXegpMPLi7i2CN/U=; b=jT7QQHUMw1ajNTilr8V+zQ7jxRrrTnoNmQRQwgCRCi9Pn5i+ue0bBgJMeeO1QDyuQQ a6ukIVk6EwAsvlON18iST/oF5Q6d+OHvDOs42VHuvPmmys9CbHoKk388KrzjRNYpIbOz kL/8w/J1mL2eRafmLTDiXuV7auJRYL8/qwad8= 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=LVAq5AWaYJHDixhW1FXa5cCKQAyAXegpMPLi7i2CN/U=; b=Hu6o0DvL569iqzIiA0yVC65Li793VqVcJrrEUSlN1/pVecrFLo3mKeQ27JuRfackkF 7dJ7POki4VZB3eSCGFazV/nFXCX2b+gLxn3mGboJ6waCRjI04NXo41lZL+gPaqIbT9ih 2fUoM7N6AJRW4WW2G3r+8Tb9kHlYnQUMBC91F9rB72XWjBXRPuCNc8iHJAMqKlu3z45M xN0xqEsOBmoPSnQqYQIRdmkaUn6pRkP94+fJh21a9CdP5FhDF327UsGF7izGBbr6QBpL r57xSL1ROUItmoxkNvnOAT9C7WaYYPb+TVKRkK5sTzy+SEyFL4OQG5sn2ocr/TeKsJrO AVgg== X-Gm-Message-State: AJaThX4zcXp1sB9LbuTg4Rpkc7MpRkvUeXfOWIkeH0a7X5rAINHzsdkl 43fay+FZBbPhozY4pQJrz24DGQ== X-Received: by 10.99.113.5 with SMTP id m5mr1517831pgc.9.1510170863243; Wed, 08 Nov 2017 11:54:23 -0800 (PST) Received: from localhost.localdomain ([106.51.18.232]) by smtp.gmail.com with ESMTPSA id p83sm10021226pfd.61.2017.11.08.11.54.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Nov 2017 11:54:22 -0800 (PST) From: Amit Pundir To: Greg KH Cc: Stable , Fengguang Wu , Shuah Khan , "Luis R . Rodriguez" , Brian Norris , Sumit Semwal , Shuah Khan Subject: [PATCH for-4.4.y 1/4] test: firmware_class: report errors properly on failure Date: Thu, 9 Nov 2017 01:24:09 +0530 Message-Id: <1510170852-32052-2-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510170852-32052-1-git-send-email-amit.pundir@linaro.org> References: <1510170852-32052-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: Brian Norris commit 47e0bbb7fa985a0f1b5794a8653fae4f8f49de77 upstream. request_firmware() failures currently won't get reported at all (the error code is discarded). What's more, we get confusing messages, like: # echo -n notafile > /sys/devices/virtual/misc/test_firmware/trigger_request [ 8280.311856] test_firmware: loading 'notafile' [ 8280.317042] test_firmware: load of 'notafile' failed: -2 [ 8280.322445] test_firmware: loaded: 0 # echo $? 0 Report the failures via write() errors, and don't say we "loaded" anything. Signed-off-by: Brian Norris Acked-by: Kees Cook Signed-off-by: Shuah Khan Signed-off-by: Amit Pundir --- lib/test_firmware.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/lib/test_firmware.c b/lib/test_firmware.c index 86374c1c49a4..841191061816 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c @@ -65,14 +65,19 @@ static ssize_t trigger_request_store(struct device *dev, release_firmware(test_firmware); test_firmware = NULL; rc = request_firmware(&test_firmware, name, dev); - if (rc) + if (rc) { pr_info("load of '%s' failed: %d\n", name, rc); - pr_info("loaded: %zu\n", test_firmware ? test_firmware->size : 0); + goto out; + } + pr_info("loaded: %zu\n", test_firmware->size); + rc = count; + +out: mutex_unlock(&test_fw_mutex); kfree(name); - return count; + return rc; } static DEVICE_ATTR_WO(trigger_request);