From patchwork Thu Feb 18 18:05:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 62234 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp730756lbl; Thu, 18 Feb 2016 10:06:02 -0800 (PST) X-Received: by 10.140.37.100 with SMTP id q91mr10531723qgq.6.1455818762638; Thu, 18 Feb 2016 10:06:02 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b93si54002535qgf.85.2016.02.18.10.06.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Feb 2016 10:06:02 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=grub-devel-bounces+patch=linaro.org@gnu.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([::1]:44008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWSxl-0002fq-Sb for patch@linaro.org; Thu, 18 Feb 2016 13:06:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWSxG-0002es-O6 for grub-devel@gnu.org; Thu, 18 Feb 2016 13:05:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWSxD-0004w5-Hg for grub-devel@gnu.org; Thu, 18 Feb 2016 13:05:30 -0500 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:38721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWSxD-0004vW-8g for grub-devel@gnu.org; Thu, 18 Feb 2016 13:05:27 -0500 Received: by mail-wm0-x232.google.com with SMTP id a4so37402996wme.1 for ; Thu, 18 Feb 2016 10:05:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id; bh=OuVJrXvx/WvtDgIXpcXyYGAn7790sOXwu01ya5n8UWc=; b=Y2DxMIvVhE50drnVMBzB3/cmzwWbc8pP3m3u9k6T6xG/3z+XN53iD4Q4RRsyBAAcQJ TgavO8+D/OI7/cVbu/vzRKpIXFTxpNvBBL1fLfgL08UXvpTOdTgUk9N7wNalbgVBJ574 +DVaW0K0/KMvHFSbtBG55hL1tBFY0hcr4Fbng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=OuVJrXvx/WvtDgIXpcXyYGAn7790sOXwu01ya5n8UWc=; b=EAnsn/9QspLeAGtyDJKislpnXNiCaSS+GueTaRm/ApIzF02NULK/cHGjHmPPOnPQLq mh0eEdyJ/UDTHyAsrKMNlWy0/Dx28X9TzzYTss99GTJsaLkIZeGYu5nmNpggXcJ7YS9/ wdYkzWXfL8Y5PNozsOyYhaGZ3guI1EyLE9GgFkKm/GaPQQNl92CdHgMvxIOHLE0RmT2d QvfDsdMCTH0IuXYf9/RGIOp2djiQXvlKmP/3hEZFiVFtzYNzK+Q9mZtGXivBowQRlfZt yzNeESTt9OkM8QEdDzGYjAI7r1WtcNA0EkInpffMhgea9nfGHcIniHrE9JaNZrFFi/Gg C+Xg== X-Gm-Message-State: AG10YORD3KLInaIikty3tCMEnYKuDZiGrs6yUBHQMZlZt1WU1JqyFOMbRtsOaQEwF0HTcU6g X-Received: by 10.28.95.6 with SMTP id t6mr4460492wmb.59.1455818726261; Thu, 18 Feb 2016 10:05:26 -0800 (PST) Received: from mohikan.mushroom.smurfnet.nu (cpc92308-cmbg19-2-0-cust814.5-4.cable.virginm.net. [82.24.251.47]) by smtp.gmail.com with ESMTPSA id d9sm7608273wjf.43.2016.02.18.10.05.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Feb 2016 10:05:25 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH] efidisk: Respect block_io_protocol buffer alignment Date: Thu, 18 Feb 2016 18:05:22 +0000 Message-Id: <1455818722-21670-1-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::232 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: grub-devel-bounces+patch=linaro.org@gnu.org Returned from the OpenProtocol operation, the grub_efi_block_io_media structure contains the io_align field, specifying the minimum alignment required for buffers used in any data transfers with the device. Make grub_efidisk_readwrite() allocate a temporary buffer, aligned to this boundary, if the buffer passed to it does not already meet the requirements. Also sanity check the io_align field in grub_efidisk_open() for power-of-two-ness and bail if invalid. Reported-by: Jeremy Linton --- v4 - Improved alignment checking as suggested by Vladimir, and moved the error exit as requested by Andrei. grub-core/disk/efi/efidisk.c | 48 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) -- 2.1.4 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c index 1c00e3e..e4f4c25 100644 --- a/grub-core/disk/efi/efidisk.c +++ b/grub-core/disk/efi/efidisk.c @@ -493,8 +493,15 @@ grub_efidisk_open (const char *name, struct grub_disk *disk) m = d->block_io->media; /* FIXME: Probably it is better to store the block size in the disk, and total sectors should be replaced with total blocks. */ - grub_dprintf ("efidisk", "m = %p, last block = %llx, block size = %x\n", - m, (unsigned long long) m->last_block, m->block_size); + grub_dprintf ("efidisk", + "m = %p, last block = %llx, block size = %x, io align = %x\n", + m, (unsigned long long) m->last_block, m->block_size, + m->io_align); + + /* Ensure required buffer alignment is a power of two (or is zero). */ + if (m->io_align & (m->io_align - 1)) + return grub_error (GRUB_ERR_IO, "invalid buffer alignment %d", m->io_align); + disk->total_sectors = m->last_block + 1; /* Don't increase this value due to bug in some EFI. */ disk->max_agglomerate = 0xa0000 >> (GRUB_DISK_CACHE_BITS + GRUB_DISK_SECTOR_BITS); @@ -524,15 +531,42 @@ grub_efidisk_readwrite (struct grub_disk *disk, grub_disk_addr_t sector, { struct grub_efidisk_data *d; grub_efi_block_io_t *bio; + grub_efi_status_t status; + grub_size_t io_align, num_bytes; + char *aligned_buf; d = disk->data; bio = d->block_io; - return efi_call_5 ((wr ? bio->write_blocks : bio->read_blocks), bio, - bio->media->media_id, - (grub_efi_uint64_t) sector, - (grub_efi_uintn_t) size << disk->log_sector_size, - buf); + /* Set alignment to 1 if 0 specified */ + io_align = bio->media->io_align ? bio->media->io_align : 1; + num_bytes = size << disk->log_sector_size; + + if ((grub_addr_t) buf & (io_align - 1)) + { + aligned_buf = grub_memalign (io_align, num_bytes); + if (! aligned_buf) + return GRUB_EFI_OUT_OF_RESOURCES; + if (wr) + grub_memcpy (aligned_buf, buf, num_bytes); + } + else + { + aligned_buf = buf; + } + + status = efi_call_5 ((wr ? bio->write_blocks : bio->read_blocks), bio, + bio->media->media_id, (grub_efi_uint64_t) sector, + (grub_efi_uintn_t) num_bytes, aligned_buf); + + if ((grub_addr_t) buf & (io_align - 1)) + { + if (!wr) + grub_memcpy (buf, aligned_buf, num_bytes); + grub_free (aligned_buf); + } + + return status; } static grub_err_t