From patchwork Tue Jul 9 20:42:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13728510 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 CCB9BC3DA45 for ; Tue, 9 Jul 2024 20:43:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65BC76B00A0; Tue, 9 Jul 2024 16:43:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60BE66B00A1; Tue, 9 Jul 2024 16:43:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D2EE6B00A2; Tue, 9 Jul 2024 16:43:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2D91E6B00A0 for ; Tue, 9 Jul 2024 16:43:15 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E115641A3A for ; Tue, 9 Jul 2024 20:43:14 +0000 (UTC) X-FDA: 82321389108.20.7CA4D3E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 4DCE340029 for ; Tue, 9 Jul 2024 20:43:13 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tDy3fCoO; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720557758; 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=fYtKuHpGHE0aDt/biEFtdntm2UP551dcf8Y1+YqccSaxHJRMZdHn6R6VO9Y5DauKcomrzR xy7bPzw19gjAGoW2gCe3BxJfC+dF2sowLa1Wu57vm5IxnBNNQ8vjmI7guOJ3At1Flshgay LrfR/6iU1iiBoi4fwX2a6oEhdUSkYfs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720557758; a=rsa-sha256; cv=none; b=abWnLypCdQWny5WC8/Mmj8AAc4h+zqYa1khW0BW45xpLDC9YTDlXivPsoOht5uFRSnOk6e 1V5g1nOTPZardSEyCYUwDiS1mnerAKJtRgDxHnkq1kq8oA7spyVKtV3ElNnu6Y1v5Y7Z91 VtFWeDmkPpTfI9j/M/jEFNBEi2oFFPU= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tDy3fCoO; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0287561491; Tue, 9 Jul 2024 20:43:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87E1EC3277B; Tue, 9 Jul 2024 20:43:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720557791; bh=z2GiV9WjwgN2ZnoTOoBHdWopafhvx9MuPC6sEC6Crd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tDy3fCoO6SHfaItCzW9k8CB8fBKXCs1BTlMP2WzJw0Fs+wUdyGhbkQHRpAw2ChWsx PRrd5MiymWcZG0I/t0RJcTbpdUHKqRfUQNjfIY4+zt0VVLsjFiTFCoPbHNyJ32cYSu 2mtfAkldPT3hZ03K66B/JV/pK8E+zeW4kfqqUogOk94XGfrE1siXmMecEByhGf4Qy/ Elrl4rMytkXAQE56K2FJjXo+rv68tM8ZnwKH1ZmesV3BwnO6vy8zo351XHmryBi/0b bG2A0ILRlmFyPcKGUk+QWYQ3fg7ISLwYytUMqbfoZCVCPeD0WKHlq3pbT0fu59vPCK DKtb+WC5pg2RQ== 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, Andrii Nakryiko Subject: [PATCH bpf-next 06/10] lib/buildid: don't limit .note.gnu.build-id to the first page in ELF Date: Tue, 9 Jul 2024 13:42:41 -0700 Message-ID: <20240709204245.3847811-7-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240709204245.3847811-1-andrii@kernel.org> References: <20240709204245.3847811-1-andrii@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4DCE340029 X-Stat-Signature: skyzqzqh785j5k869rdymgr17c6541dx X-Rspam-User: X-HE-Tag: 1720557793-122930 X-HE-Meta: U2FsdGVkX1+jsG9i59fcPwV/BnDwvGn0qIQp0EoYo0fLmRi4LH/bLjNmtV34CyjR4fedy1kBBfOiJduAGalcKIQK7Ugtuh7GwLhcqXbVcBXuqGiZ5rielMbV14gX1301j6QeXUXAtk2vrrbaMMh4pOjKPMydacQoHBrGozL6QOAutxsRLqCX/DQ6wUGvf0DH9UJ4et+eCycpE52T3DQqrfhyN5FBf38iAa5ZgEkwSBSYhT6Av/6FkAHYcpGMRgX6MIQ9bPRoFZs5smhjdS94+K1fiuQBNosSlqO7fx+RARZI+/jQj01YoxQdjKfb5ERQlKvXeH9MoZTQq1ZT5wtn6eytSBOwNRvAb5IL2/9XwRoL41TwURL28zRCJ4HQj00g2vesQYWggez5DwTTyqWig10y8Q1wXb5jDk4durzeDakHTumvnfBWRWTdKD/7sRKH7tJFWWlJTmHbtl8NfbqVTJ5Wnf9KTiZYRftfZAWLDczNQW6d2ofU3jIHcxUgrudVyo6WTFZqtXlrK2CTVyxHKY/+tA3aViJvHmc7gg0B/3WeyHYJIGvktkjcyDD2gA5BdwkD8LOCU11BKrf2yuE0bakwC/pmjPNoberjcvawImc5mElNkW+5/ClYRq3wZEZaEh0L/Pemhn8FBO6haZQ3t1zwEfHLFYxedxZxxEaZeqTCloP5X/rqkN5KA9tjr0gBERUG9jZ7Y4TblxIlFasMQL2JM6fAO5Q9Jsae6Ehz2WqlNM/mn4pUpRaldAcufxm8hBSQN3/jSC07mPjaa7wggXIoIPpCzD+/8I6z01OFpQa1iUza5scU4ICgGKRErtJuopeDWdygH0nvNJUmkytUI3qFQ+sUQ3YtNQOEYQNcIhqVR4bGAx4HzqKWEMAnxFzP0moFCjBm4Cx2Tb7PzkE9XgFv0d3hNqf7EK/Z+GvWPCem98cQVxAjPhFzu7avhnYwvoMHH7z8MKNpKL0hdwX 0whuPHRM QcHxWmZOuJHsyyzifPuDuvmt9VmZ+wvlSzxkbhH+0qqu/PnlxxcrkGM9DKziKBNdBUeWb5M/zOnkmZkNUyi3Id/m26ooxWBOG6iobkKXlhBtPcp+0SVorK153ILZHZLHLsCTd2zsmSD9vjE5xVo2/EBuDqZwhZLFnqkShmlWkC5fqCqjux1XlYuoxNldBOlAVYmxAtYiHsE0eLyQur/8T0ByruGuO0iPjn4P31rUwYqUVUgo= 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)