Received: by 10.223.185.116 with SMTP id b49csp6304094wrg; Wed, 28 Feb 2018 07:16:11 -0800 (PST) X-Google-Smtp-Source: AH8x224sDEoEz5bJ35Veuqfqqy3VVND1pVtx3XvJ5Y2KSdE4B9eSjQKWDq9i6iv050zqSBS46KA4 X-Received: by 10.101.64.139 with SMTP id t11mr14342437pgp.304.1519830971354; Wed, 28 Feb 2018 07:16:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519830971; cv=none; d=google.com; s=arc-20160816; b=D7SIeq5zVjpbPo9TN17R5sUlvlIbTw+yA0KiVK8HmIzYZTNNAKRdtAlgcEcGIL6I+F GPQCs1wbkg+uPcX+B3k+3thv2LQ6c48Gg7DgBJpL4VVt57uo5TdKAJHmOT2TLBxpIiob bUgmAkZqFae+PN0wzrhHXRc/YBlwIHmy3bfrTT8nq6iK//YZ7kiZp5qT8XiKvTECG3Gc Qe5VJCnBYy8qEsIXR0KMTuSuju3iA7DPADWOSaw/XuXohKiVAp0qdbt1phWP9PF57Tlm dEyUb8ospSlHF/eNY8fGgMBU2RGEYRZSj6eDBWhpimt0gaFdFf2VSQlqmINCEmnRNwNR kU/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ZRghpciq4YSL+1iyTO5irUH3fxGkYm4ccvkNnNKRnP4=; b=WfSnOGzXFMF+e7Y2IjAHtPUUOtVnSiFPAYjoBl451XxDokz57K+XnLDnINUWOFeM2W r6xMecYcI6iYIF5Nd5quGLo+bL68jQ4ScvccLMc5nMKAtxnuAfb9ljIgBZWYQX5WZpps Y/ixbkjHdxthv3cucJYc1OHwld3XrkVum1KYqKFrP8GPA/N0AQ1vmJT6JwH7TmM2uJ0f spJUIdPO8vrVKbASTfjcjD1qfA7wbyBqTHIIAPsYXhy59O7m01O8w02y1l6GjenrOqiD DNgGv8M2sijVr8Ae+u3Tacbhj0BNoclrp4EcnNEijP3hccyI7q9ePBsBn4caZSQHO3TD cp5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f9si668241pgq.743.2018.02.28.07.15.55; Wed, 28 Feb 2018 07:16:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752831AbeB1PNQ (ORCPT + 99 others); Wed, 28 Feb 2018 10:13:16 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57876 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752592AbeB1PGq (ORCPT ); Wed, 28 Feb 2018 10:06:46 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F06C4402290A; Wed, 28 Feb 2018 15:06:45 +0000 (UTC) Received: from localhost (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96CF89C04B; Wed, 28 Feb 2018 15:06:45 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: linux-kernel@vger.kernel.org Cc: arnd@arndb.de, bhe@redhat.com, slp@redhat.com, mst@redhat.com, somlo@cmu.edu, xiaolong.ye@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v16 06/11] fw_cfg: handle fw_cfg_read_blob() error Date: Wed, 28 Feb 2018 16:06:10 +0100 Message-Id: <20180228150615.17317-7-marcandre.lureau@redhat.com> In-Reply-To: <20180228150615.17317-1-marcandre.lureau@redhat.com> References: <20180228150615.17317-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 28 Feb 2018 15:06:46 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 28 Feb 2018 15:06:46 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'marcandre.lureau@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org fw_cfg_read_blob() may fail, but does not return error. This may lead to surprising behaviours, like populating zero file entries (in register_file() or during read). Return an error if ACPI locking failed. Also, the following DMA read/write extension will add more error paths that should be handled appropriately. Signed-off-by: Marc-André Lureau --- drivers/firmware/qemu_fw_cfg.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index 0cc71d028ae3..45bfc389b226 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -77,8 +77,8 @@ static void fw_cfg_sel_endianness(u16 key) } /* read chunk of given fw_cfg blob (caller responsible for sanity-check) */ -static void fw_cfg_read_blob(u16 key, - void *buf, loff_t pos, size_t count) +static ssize_t fw_cfg_read_blob(u16 key, + void *buf, loff_t pos, size_t count) { u32 glk = -1U; acpi_status status; @@ -91,7 +91,7 @@ static void fw_cfg_read_blob(u16 key, /* Should never get here */ WARN(1, "fw_cfg_read_blob: Failed to lock ACPI!\n"); memset(buf, 0, count); - return; + return -EINVAL; } mutex_lock(&fw_cfg_dev_lock); @@ -102,6 +102,7 @@ static void fw_cfg_read_blob(u16 key, mutex_unlock(&fw_cfg_dev_lock); acpi_release_global_lock(glk); + return count; } /* clean up fw_cfg device i/o */ @@ -183,8 +184,9 @@ static int fw_cfg_do_platform_probe(struct platform_device *pdev) } /* verify fw_cfg device signature */ - fw_cfg_read_blob(FW_CFG_SIGNATURE, sig, 0, FW_CFG_SIG_SIZE); - if (memcmp(sig, "QEMU", FW_CFG_SIG_SIZE) != 0) { + if (fw_cfg_read_blob(FW_CFG_SIGNATURE, sig, + 0, FW_CFG_SIG_SIZE) < 0 || + memcmp(sig, "QEMU", FW_CFG_SIG_SIZE) != 0) { fw_cfg_io_cleanup(); return -ENODEV; } @@ -344,8 +346,7 @@ static ssize_t fw_cfg_sysfs_read_raw(struct file *filp, struct kobject *kobj, if (count > entry->size - pos) count = entry->size - pos; - fw_cfg_read_blob(entry->select, buf, pos, count); - return count; + return fw_cfg_read_blob(entry->select, buf, pos, count); } static struct bin_attribute fw_cfg_sysfs_attr_raw = { @@ -501,7 +502,11 @@ static int fw_cfg_register_dir_entries(void) struct fw_cfg_file *dir; size_t dir_size; - fw_cfg_read_blob(FW_CFG_FILE_DIR, &files_count, 0, sizeof(files_count)); + ret = fw_cfg_read_blob(FW_CFG_FILE_DIR, &files_count, + 0, sizeof(files_count)); + if (ret < 0) + return ret; + count = be32_to_cpu(files_count); dir_size = count * sizeof(struct fw_cfg_file); @@ -509,7 +514,10 @@ static int fw_cfg_register_dir_entries(void) if (!dir) return -ENOMEM; - fw_cfg_read_blob(FW_CFG_FILE_DIR, dir, sizeof(files_count), dir_size); + ret = fw_cfg_read_blob(FW_CFG_FILE_DIR, dir, + sizeof(files_count), dir_size); + if (ret < 0) + goto end; for (i = 0; i < count; i++) { ret = fw_cfg_register_file(&dir[i]); @@ -517,6 +525,7 @@ static int fw_cfg_register_dir_entries(void) break; } +end: kfree(dir); return ret; } @@ -557,7 +566,10 @@ static int fw_cfg_sysfs_probe(struct platform_device *pdev) goto err_probe; /* get revision number, add matching top-level attribute */ - fw_cfg_read_blob(FW_CFG_ID, &rev, 0, sizeof(rev)); + err = fw_cfg_read_blob(FW_CFG_ID, &rev, 0, sizeof(rev)); + if (err < 0) + goto err_probe; + fw_cfg_rev = le32_to_cpu(rev); err = sysfs_create_file(fw_cfg_top_ko, &fw_cfg_rev_attr.attr); if (err) -- 2.16.1.73.g5832b7e9f2