From patchwork Wed Aug 30 19:13:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 111341 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1410436qge; Wed, 30 Aug 2017 12:14:36 -0700 (PDT) X-Received: by 10.101.76.141 with SMTP id m13mr2534980pgt.231.1504120476512; Wed, 30 Aug 2017 12:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504120476; cv=none; d=google.com; s=arc-20160816; b=ki1u/V6Y6ZMfJRYNgpaOUnI8MW5MUug+r/aZPz5GlwQ0zmcZTfqe7n16QqFJP+ccGk EUBcg72/SndQPIrTPdwAHavzoYOk9mVMoyPEGarW6nudvzqTArDba4JMXfOEHfzlTQR8 WqeBFaW8H+I3qF1GT6Glc2iAoetLTlBeTdWsB1FjG+C2F8IsRsYv4uUPNDoy17Csm+zr emnik+UehDY5na14YGoEA4Du3CI/Wqy3RlGok49gyIBactCxmo2L9XPUjWeL/Ygnrmw2 wsWyNJGz3+24ardTqykraaBXzkyhScwPYRIvXcsPCVoUxH3qO4c+o3z8nZtf3nE8x6JJ WdAA== 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:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=lhNO8/jx6ztYjE4ixgwoI6SqyCnq4x2Bge0yMuYcAyw=; b=W4iyAs4J6qNr6EtWn5WqxCBbNUJWcLIm2RBd+0TyUX8wRhDfJrTCQBwHauXittTGc7 AXbkBGGjf+c3DMlJMHS7fkkOG96zF+AKInJLPcbioZcSsaKGSnghz+KSuNXeRlUZkKYh LcK2/Ik/mZSaNfUlDu1R5dsMhWaON0qjrhWS51k/b2zh5hsDixdlzM8jpF6eDzYQT+g9 I3EbcGkz0jG5C57q5LOn2pMlR6vQkiJbndDjzFxH4/Ss7bmEFIa63medXYLYF0WYiKbJ 2gjRYosIjBUWMP+MHf7zog41bmni2f7+Qs+VZRQjD4PVg91CmMLGk8toXsCWbr+TmECs Y5iw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i188si2899624pgc.79.2017.08.30.12.14.36; Wed, 30 Aug 2017 12:14:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-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-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750828AbdH3TOf (ORCPT + 2 others); Wed, 30 Aug 2017 15:14:35 -0400 Received: from david.siemens.de ([192.35.17.14]:48985 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750814AbdH3TOf (ORCPT ); Wed, 30 Aug 2017 15:14:35 -0400 Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v7UJDwNY025199 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Aug 2017 21:13:58 +0200 Received: from md1f2u6c.ww002.siemens.net.net ([139.25.68.37]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v7UJDvsC004213; Wed, 30 Aug 2017 21:13:58 +0200 From: Jan Kiszka To: Ben Hutchings Cc: cip-dev@lists.cip-project.org, Linus Torvalds , Matt Fleming , Peter Zijlstra , Thomas Gleixner , linux-efi@vger.kernel.org Subject: [PATCH 13/14] efi/capsule-loader: Use page addresses rather than struct page pointers Date: Wed, 30 Aug 2017 21:13:55 +0200 Message-Id: <01f0bf4cd9c202d2c871295c3068ea22f05dd50e.1504120436.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org From: Ard Biesheuvel commit 2a457fb31df62c6b482f78e4f74aaed99271f44d upstream. To give some leeway to code that handles non-standard capsule headers, let's keep an array of page addresses rather than struct page pointers. This gives special implementations of efi_capsule_setup_info() the opportunity to mangle the payload a bit before it is presented to the firmware, without putting any knowledge of the nature of such quirks into the generic code. Tested-by: Bryan O'Donoghue Signed-off-by: Ard Biesheuvel Cc: Linus Torvalds Cc: Matt Fleming Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170602135207.21708-10-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- drivers/firmware/efi/capsule-loader.c | 12 ++++++++---- drivers/firmware/efi/capsule.c | 7 ++++--- include/linux/efi.h | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) -- 2.12.3 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index f7fdeab0bc37..feeafb673c07 100644 --- a/drivers/firmware/efi/capsule-loader.c +++ b/drivers/firmware/efi/capsule-loader.c @@ -20,6 +20,10 @@ #define NO_FURTHER_WRITE_ACTION -1 +#ifndef phys_to_page +#define phys_to_page(x) pfn_to_page((x) >> PAGE_SHIFT) +#endif + /** * efi_free_all_buff_pages - free all previous allocated buffer pages * @cap_info: pointer to current instance of capsule_info structure @@ -31,7 +35,7 @@ static void efi_free_all_buff_pages(struct capsule_info *cap_info) { while (cap_info->index > 0) - __free_page(cap_info->pages[--cap_info->index]); + __free_page(phys_to_page(cap_info->pages[--cap_info->index])); cap_info->index = NO_FURTHER_WRITE_ACTION; } @@ -161,12 +165,12 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff, goto failed; } - cap_info->pages[cap_info->index++] = page; + cap_info->pages[cap_info->index++] = page_to_phys(page); cap_info->page_bytes_remain = PAGE_SIZE; + } else { + page = phys_to_page(cap_info->pages[cap_info->index - 1]); } - page = cap_info->pages[cap_info->index - 1]; - kbuff = kmap(page); if (!kbuff) { ret = -ENOMEM; diff --git a/drivers/firmware/efi/capsule.c b/drivers/firmware/efi/capsule.c index 1106773468b2..4a867c65d740 100644 --- a/drivers/firmware/efi/capsule.c +++ b/drivers/firmware/efi/capsule.c @@ -218,7 +218,7 @@ efi_capsule_update_locked(efi_capsule_header_t *capsule, * * Return 0 on success, a converted EFI status code on failure. */ -int efi_capsule_update(efi_capsule_header_t *capsule, struct page **pages) +int efi_capsule_update(efi_capsule_header_t *capsule, phys_addr_t *pages) { u32 imagesize = capsule->imagesize; efi_guid_t guid = capsule->guid; @@ -257,10 +257,11 @@ int efi_capsule_update(efi_capsule_header_t *capsule, struct page **pages) } for (j = 0; j < SGLIST_PER_PAGE && count > 0; j++) { - u64 sz = min_t(u64, imagesize, PAGE_SIZE); + u64 sz = min_t(u64, imagesize, + PAGE_SIZE - (u64)*pages % PAGE_SIZE); sglist[j].length = sz; - sglist[j].data = page_to_phys(*pages++); + sglist[j].data = *pages++; imagesize -= sz; count--; diff --git a/include/linux/efi.h b/include/linux/efi.h index b386097e45bc..23a2a274bc6c 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -135,7 +135,7 @@ struct capsule_info { long index; size_t count; size_t total_size; - struct page **pages; + phys_addr_t *pages; size_t page_bytes_remain; }; @@ -1246,7 +1246,7 @@ extern int efi_capsule_supported(efi_guid_t guid, u32 flags, size_t size, int *reset); extern int efi_capsule_update(efi_capsule_header_t *capsule, - struct page **pages); + phys_addr_t *pages); #ifdef CONFIG_EFI_RUNTIME_MAP int efi_runtime_map_init(struct kobject *);