From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5007EC004D4 for ; Sat, 21 Jan 2023 18:14:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5B9885509; Sat, 21 Jan 2023 19:14:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k6gN/qKj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A4F18555F; Sat, 21 Jan 2023 19:14:32 +0100 (CET) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 93EA185203 for ; Sat, 21 Jan 2023 19:14:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x82b.google.com with SMTP id e8so6721440qts.1 for ; Sat, 21 Jan 2023 10:14:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=kkVFOaEJonVb9sA/ZSJncuyqp3jDMUz8U6a0nJGi3R4=; b=k6gN/qKj2nSoc7qD5WDEDbTpOi1mUTtKTGhKeIpnx8P+R3H95qg7e9v7ERYRbniF4O 1mod31LpgBpr09uVehxbA1ZALm67wkoBJLZ9NvoZVNvBySMgQx+zOEaJYWnB0qPpPuZl 6UWdQMs8rZmJ5JOI95dodZ6MNdmR7AbSCWtUWAsRVp94P6IVdD/CF+comvw2YzwLWtzZ bgwoAhX+9eA7q71wA5f5cuGz5CNAWdImrEYpX6wOFrREgBk4Z7NVrKutLHAGhAB6AZ8j hfxmAZBsUqqPZ5ZUKV5ZzQnX30pMwpq48VIz5fdYydufId5L5iJn74whgGpEFmQalq1f qQ8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kkVFOaEJonVb9sA/ZSJncuyqp3jDMUz8U6a0nJGi3R4=; b=gZWhQSYTsy5+MHWX5tJZOeWxd6xM5CVgyoV3fkFxX/TdJB1b4EnGiNP9yde9mCmJUF BKFvdSJjmoq3cHxgRjgwYCxihNYf7iRZZrLVN7/2gOofxA/oLzgZRZQZcEmsz9bMXcSV Mig80rUbqqsj5PrIXGZMbVmUjHo2VI1YnkuWxMpU2RREfhTVv8aYZzOq7ZkfCEIB5lM8 vgQxu7ETZOsZI1QVClFMuWXPRORKPdYh7l1JblO6zu6J01KgVxHDgsxaNO75X3dijao4 4OkDgC4N6Q0P46dS6wCu1dj0CDSxGM50RuL3cUM8JvC6rAfG99V7MsfLDiAVw+nxyRa+ MsJQ== X-Gm-Message-State: AFqh2krEwSb4jkwI7FJwG4+8zKRAmKxVq8tUXnjNO8de3SIuWcykEzrL zoWwpr2mT+IzKG8PqHad+18rPS9PDDA= X-Google-Smtp-Source: AMrXdXufEBLykl3pHEax8U6eY24j8EPfKaoK8fhJ11aiFKMqBQNOBrW7XzUveW3YjDf2OFyCsMU7Og== X-Received: by 2002:ac8:44c6:0:b0:3b6:3272:960e with SMTP id b6-20020ac844c6000000b003b63272960emr27780015qto.54.1674324868182; Sat, 21 Jan 2023 10:14:28 -0800 (PST) Received: from [192.168.1.201] (pool-173-73-95-180.washdc.fios.verizon.net. [173.73.95.180]) by smtp.gmail.com with ESMTPSA id o5-20020a05620a2a0500b006f9e103260dsm29007791qkp.91.2023.01.21.10.14.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Jan 2023 10:14:27 -0800 (PST) Message-ID: <96cd50e1-babc-47cd-cc61-5dca67b3a711@gmail.com> Date: Sat, 21 Jan 2023 13:14:26 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] ifwitool: Fix member access Content-Language: en-US To: Simon Glass , u-boot@lists.denx.de Cc: Mikhail Ilin References: <20230118201317.1777857-1-sjg@chromium.org> From: Sean Anderson In-Reply-To: <20230118201317.1777857-1-sjg@chromium.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean On 1/18/23 15:13, Simon Glass wrote: > On a second and third look, a recent patch seems to be writing to the > wrong place - updating offsets from the address of the pointer instead > of what the pointer points to. > > Fix it. > > Signed-off-by: Simon Glass > Fixes: 2d1b2ac13fe ("tool: ifwitool: Fix buffer overflow") > --- > > tools/ifwitool.c | 40 ++++++++++++++++++++-------------------- > 1 file changed, 20 insertions(+), 20 deletions(-) > > diff --git a/tools/ifwitool.c b/tools/ifwitool.c > index 31591863b2e..c1defe57737 100644 > --- a/tools/ifwitool.c > +++ b/tools/ifwitool.c > @@ -721,7 +721,7 @@ static size_t read_member(void *src, size_t offset, size_t size_bytes, > */ > static size_t fix_member(void *data, size_t offset, size_t size_bytes) > { > - uint8_t *src = (uint8_t *)data + offset; > + void *src = (uint8_t *)data + offset; > > switch (size_bytes) { > case 1: > @@ -1441,20 +1441,20 @@ static void bpdt_fixup_write_buffer(struct buffer *buf) > > size_t offset = 0; > > - offset = fix_member(&s, offset, sizeof(h->signature)); > - offset = fix_member(&s, offset, sizeof(h->descriptor_count)); > - offset = fix_member(&s, offset, sizeof(h->bpdt_version)); > - offset = fix_member(&s, offset, sizeof(h->xor_redundant_block)); > - offset = fix_member(&s, offset, sizeof(h->ifwi_version)); > - offset = fix_member(&s, offset, sizeof(h->fit_tool_version)); > + offset = fix_member(s, offset, sizeof(h->signature)); > + offset = fix_member(s, offset, sizeof(h->descriptor_count)); > + offset = fix_member(s, offset, sizeof(h->bpdt_version)); > + offset = fix_member(s, offset, sizeof(h->xor_redundant_block)); > + offset = fix_member(s, offset, sizeof(h->ifwi_version)); > + offset = fix_member(s, offset, sizeof(h->fit_tool_version)); > > uint32_t i; > > for (i = 0; i < count; i++) { > - offset = fix_member(&s, offset, sizeof(e[i].type)); > - offset = fix_member(&s, offset, sizeof(e[i].flags)); > - offset = fix_member(&s, offset, sizeof(e[i].offset)); > - offset = fix_member(&s, offset, sizeof(e[i].size)); > + offset = fix_member(s, offset, sizeof(e[i].type)); > + offset = fix_member(s, offset, sizeof(e[i].flags)); > + offset = fix_member(s, offset, sizeof(e[i].offset)); > + offset = fix_member(s, offset, sizeof(e[i].size)); > } > } > > @@ -1654,21 +1654,21 @@ static void subpart_dir_fixup_write_buffer(struct buffer *buf) > size_t count = h->num_entries; > size_t offset = 0; > > - offset = fix_member(&s, offset, sizeof(h->marker)); > - offset = fix_member(&s, offset, sizeof(h->num_entries)); > - offset = fix_member(&s, offset, sizeof(h->header_version)); > - offset = fix_member(&s, offset, sizeof(h->entry_version)); > - offset = fix_member(&s, offset, sizeof(h->header_length)); > - offset = fix_member(&s, offset, sizeof(h->checksum)); > + offset = fix_member(s, offset, sizeof(h->marker)); > + offset = fix_member(s, offset, sizeof(h->num_entries)); > + offset = fix_member(s, offset, sizeof(h->header_version)); > + offset = fix_member(s, offset, sizeof(h->entry_version)); > + offset = fix_member(s, offset, sizeof(h->header_length)); > + offset = fix_member(s, offset, sizeof(h->checksum)); > offset += sizeof(h->name); > > uint32_t i; > > for (i = 0; i < count; i++) { > offset += sizeof(e[i].name); > - offset = fix_member(&s, offset, sizeof(e[i].offset)); > - offset = fix_member(&s, offset, sizeof(e[i].length)); > - offset = fix_member(&s, offset, sizeof(e[i].rsvd)); > + offset = fix_member(s, offset, sizeof(e[i].offset)); > + offset = fix_member(s, offset, sizeof(e[i].length)); > + offset = fix_member(s, offset, sizeof(e[i].rsvd)); > } > } > This fixes build errors for me. Acked-by: Sean Anderson