From patchwork Wed Jul 24 22:52:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13741434 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E44FAC3DA61 for ; Wed, 24 Jul 2024 22:52:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 04A716B009F; Wed, 24 Jul 2024 18:52:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F3B1B6B00A1; Wed, 24 Jul 2024 18:52:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D63E86B00A3; Wed, 24 Jul 2024 18:52:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A166E6B009F for ; Wed, 24 Jul 2024 18:52:36 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 64A33A4695 for ; Wed, 24 Jul 2024 22:52:36 +0000 (UTC) X-FDA: 82376147112.17.7D57084 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id B6A8D40003 for ; Wed, 24 Jul 2024 22:52:34 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=iHUH9AVU; spf=pass (imf04.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721861530; a=rsa-sha256; cv=none; b=d+u5v5iIlgcfNPG7eyk9td7UmjB+5Rh1QEEhfBdyYvHAcQQ9j9Vn3IjBTp6vve+igh9B4U +42BGoTXHg4YKqT4UJ+JEmlLe2dAlrvceE+RHr5ySh7uzvX6nBNvKUyWUBOUFllBCaj53z Iu7ulL40jE+BoktFhj2+7LhmQ6FeUiA= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=iHUH9AVU; spf=pass (imf04.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721861530; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/T1RhSNFogjXWjH1T1rWHz4xvKilsEtvOIoqPPlohSc=; b=33W4R2oQK8yjK+Ye3IDk6ki1+KTwjmnp92azNddSL4eHJbGm0Cz2hCosxKyy2ffZCV829T 5s5O64o3sXCiibiLgHXlCvjcUx+sVW8wcx/gOI9df+gpUt4atp2zj2q0vV0XlbOc8auPzw xbmll5QxSONUhzr7rd45kkHj78rzFb0= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E4EC661232; Wed, 24 Jul 2024 22:52:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 788D3C32781; Wed, 24 Jul 2024 22:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721861553; bh=z2GiV9WjwgN2ZnoTOoBHdWopafhvx9MuPC6sEC6Crd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iHUH9AVUcEK7NLYHGspPRaMdC8HeusUjt3LTsHRjp9gWWo4MPW4MgLl2MGu3YDiIs xVyIwtqGyMCbLdQyVaoad66Nd0AA9SZ+DyPte034LGtLR7fMFcHhOKt8yV5Pi1zHCV 7NIF+N1Jgy1otd8xqT8YO1nsRgn33w2pwuxtxCiWzVy/AyvV5kCs5GbNH9l7iEojsQ 0mBTpOZrMJlWbOXIk690QI2WW2TOrsWw9b4/lRTZgE4+q/bMAR3EsUPnO8vFWkD80U 3kWPgDLeUtEvxJnjxMcMrqxANgHr5nvlHIwutDewpDBIRh5kCeXTbwsPo0/iF5oCME rrEf7fiznF4RQ== From: Andrii Nakryiko To: bpf@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, adobriyan@gmail.com, shakeel.butt@linux.dev, hannes@cmpxchg.org, ak@linux.intel.com, osandov@osandov.com, song@kernel.org, Andrii Nakryiko Subject: [PATCH v2 bpf-next 06/10] lib/buildid: don't limit .note.gnu.build-id to the first page in ELF Date: Wed, 24 Jul 2024 15:52:06 -0700 Message-ID: <20240724225210.545423-7-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240724225210.545423-1-andrii@kernel.org> References: <20240724225210.545423-1-andrii@kernel.org> MIME-Version: 1.0 X-Stat-Signature: xke8siwxq8yweou7tisrf4ep6fdccdna X-Rspamd-Queue-Id: B6A8D40003 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1721861554-521928 X-HE-Meta: U2FsdGVkX1/F1UJwPcdczYdfLdLUal6+0U0vnI2JnLyE0ZwvsmVFZU/glsAMNAHTXIociVFOjuoWUYX/XwxsVlN7WoDBQNB66rSIhwtxCIrttuJa0/H6c9X2TVXjsWG8Q5c8OFxFOUgoKC2RbwdLEiVIBHt1U4EcnySX6KQfzOcQReZ5I5k8aCpO4jcmZtyh1DP5KX/IFAMCFVkTnUPOoHAGSld/uD3RqzHbnMnVZQwrwUgZudfYkMqHM6WoP5qz9NpKZAfQuLHJfPXIKxzd9L9nOtbFLiwLukl7SJaBYvUwWBAYfBJckKm+7crPkc5fzPZUXa5mQMhemUx95Gg4nMwjfFMMy6JeLM1zMWArGAYIjpjhRHvoXcmjrIF1lpgDWD3FNi3zrwgzh9DVXznvp4OEsAiRsp699wOmTP/lK9VfOJEmAPhyobwxVzGkuVc8GmGwXHiNVQjL98Noj9z58Mzs7lSHZ5KwSwM2yeqP2IFAVIfH28fqGUZkxP+2L3lKDGWkaCW6xdN7aihShEMnOEnbQEXybWmq1/gHVm4EEI9ksX4kycZe1ena2JtDSbEHpFpLBgSHH48xo8cG2QL0MyUeDTlGKRm14pHOSahudupnT4911nlix8XF1DYZcoXDPDDsfZEmP2R0pbdzaVZPqf1L40clNjqh24NboheowHALAiiXugtpRZRP+LWUXHNnnqoEPfSRe71mPkCcKg3hRVKt9kHqbFeeJCnurZerzDpGDssJ81+ZHYxQCnjbNJ8gjEAn1WHof6UrPuzV/r8E5yKq9Qx5Pd6b122OiJyWAmg1Hhz2bWDz0M/QLJJOblLacweWNzUNsE3MLLCLIOkP0p37b8Vjegi3KsaiFze5hTlmFSMSgABxHjt6gJVdiF9svwtRCU79v95eCn3vQNHAJ0Km6bhN24gs1b3EY3gq/slHhMrdEjWjcL7LA7kmB7CRcBobKsIxVhQu8ri5nk2 m+M9OMmM yfv2uH8odw6kyS5RZFaTvbLxrnF288eKQqLIgy6iyEuQXmj6b7YDnO/OlEnPY+dVYqR7IexCPCoTE2/fzpmwiH7bNzRtHrBvA9SuUdXPSZy294Bkf3a4tmv4vKDKizY3CuynXcNx9UzC9FtBMVEbyqYrXC6uJAF0PUBN3q61Xwa86YA4/jZeihzIloB3pbjRuOhjhx8oNSB8sz6UdovBVE9xzu+KW5ONH/jMfkH24OGEDlgA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: With freader we don't need to restrict ourselves to a single page, so let's allow ELF notes to be at any valid position with the file. We also merge parse_build_id() and parse_build_id_buf() as now the only difference between them is note offset overflow, which makes sense to check in all situations. Signed-off-by: Andrii Nakryiko --- lib/buildid.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/lib/buildid.c b/lib/buildid.c index 23bfc811981a..419966d88cd5 100644 --- a/lib/buildid.c +++ b/lib/buildid.c @@ -152,9 +152,8 @@ static void freader_cleanup(struct freader *r) * 32-bit and 64-bit system, because Elf32_Nhdr and Elf64_Nhdr are * identical. */ -static int parse_build_id_buf(struct freader *r, - unsigned char *build_id, __u32 *size, - u64 note_offs, Elf32_Word note_size) +static int parse_build_id(struct freader *r, unsigned char *build_id, __u32 *size, + u64 note_offs, Elf32_Word note_size) { const char note_name[] = "GNU"; const size_t note_name_sz = sizeof(note_name); @@ -163,6 +162,10 @@ static int parse_build_id_buf(struct freader *r, const Elf32_Nhdr *nhdr; const char *data; + /* check for overflow */ + if (note_offs + note_size < note_offs) + return -EINVAL; + while (note_offs + sizeof(Elf32_Nhdr) < note_end) { nhdr = freader_fetch(r, note_offs, sizeof(Elf32_Nhdr) + note_name_sz); if (!nhdr) @@ -199,23 +202,6 @@ static int parse_build_id_buf(struct freader *r, return -EINVAL; } -static inline int parse_build_id(struct freader *r, - unsigned char *build_id, - __u32 *size, - u64 note_start_off, - Elf32_Word note_size) -{ - /* check for overflow */ - if (note_start_off + note_size < note_start_off) - return -EINVAL; - - /* only supports note that fits in the first page */ - if (note_start_off + note_size > PAGE_SIZE) - return -EINVAL; - - return parse_build_id_buf(r, build_id, size, note_start_off, note_size); -} - /* Parse build ID from 32-bit ELF */ static int get_build_id_32(struct freader *r, unsigned char *build_id, __u32 *size) { @@ -369,7 +355,7 @@ int build_id_parse_buf(const void *buf, unsigned char *build_id, u32 buf_size) freader_init_from_mem(&r, buf, buf_size); - return parse_build_id_buf(&r, build_id, NULL, 0, buf_size); + return parse_build_id(&r, build_id, NULL, 0, buf_size); } #if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) || IS_ENABLED(CONFIG_VMCORE_INFO)