From patchwork Thu Aug 29 17:42:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13783492 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 6162DC87FCD for ; Thu, 29 Aug 2024 17:42:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E42076B00A0; Thu, 29 Aug 2024 13:42:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D7C886B00A4; Thu, 29 Aug 2024 13:42:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA7966B00AB; Thu, 29 Aug 2024 13:42:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 95D956B00A0 for ; Thu, 29 Aug 2024 13:42:42 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 37F3F80F55 for ; Thu, 29 Aug 2024 17:42:42 +0000 (UTC) X-FDA: 82506002964.24.657E1AB Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf16.hostedemail.com (Postfix) with ESMTP id 5838618000B for ; Thu, 29 Aug 2024 17:42:40 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=urHzLm72; spf=pass (imf16.hostedemail.com: domain of andrii@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724953315; a=rsa-sha256; cv=none; b=qAUe+CpkVEUNwgdd3pNTC7lOZdd0BC1oqxoRzo+p6cjjJMiT7CSgNIyyJEvI+X22xXUXnv JmNF77GGWZICpPAKCspJlr9v9/iw7flbHhzqH2feCKrReVKzB73D4GxdPmtV8HJjLbOXl2 uhC+ewkSrfo8c4iTAeYBZfxEaEqrIj0= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=urHzLm72; spf=pass (imf16.hostedemail.com: domain of andrii@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724953315; 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=C6Ea2t2suroOwHkv8688e4INVvktX0WEK1owCc2+iOY=; b=TvyTxRngbuwhxu7V5Khm6WThbK5EZd4UfLGP1+ke13S7/AuzBL32FQZ+jQwMrIAXsdh3Ur ecbYcqnDhli5a9BH7bV9FRRefMLuyOc17DiYxS1+FVefacLH9MjYbERZzC8LW2rAS7cuKp 9FijGfp5jKVZrVRSqJjdFXuRZHEI1ts= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 445CDAE2CBA; Thu, 29 Aug 2024 17:42:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D37AC4CEC1; Thu, 29 Aug 2024 17:42:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724953358; bh=wR1R0e1Zi9YKCuyt9M3VgHLYSWK2su/QlRrjtoWcppc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=urHzLm72UFR1B7nmShcEOGVpnFSl6PfYIqK/V3jPtWPlpy89zKCsy7GLfVrcobWIz v+SiX1zosX/t0XpzBqYd3GWtGMK/EIya1ThmeOfj0M6glnTzk7+kAkNx8RSOaj40uK 8JUhVdJ6aQXkI9PMwpCar36PnUqK9xO1DZhGZJu+Rckc+hzbbibh0u1qrhDyl9BUa9 yN0psa9zIYwkb4dM9OHFRbabe+b0TnxKHuBpFHUb0sfHJZWXtnEcLzRcozVjQ8LIVY dCkTmULMjQmi4oDOxE85M6i0Qapac8t3NfxCI+ZYHk3gqYu9A/PQQKx4N5uvzOE7dm +y1Dl1GOIDpHA== 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, jannh@google.com, linux-fsdevel@vger.kernel.org, willy@infradead.org, Andrii Nakryiko , stable@vger.kernel.org, Eduard Zingerman Subject: [PATCH v7 bpf-next 01/10] lib/buildid: harden build ID parsing logic Date: Thu, 29 Aug 2024 10:42:23 -0700 Message-ID: <20240829174232.3133883-2-andrii@kernel.org> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240829174232.3133883-1-andrii@kernel.org> References: <20240829174232.3133883-1-andrii@kernel.org> MIME-Version: 1.0 X-Stat-Signature: g9ikpf1epa9xzdr1awmurpxygpz6uoo3 X-Rspamd-Queue-Id: 5838618000B X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1724953360-366640 X-HE-Meta: U2FsdGVkX1+CyikupURUCpCSyU/WPDzvTEdKadxsBlW/oza3/1piYvqt92t5ntzy3OIFVRcW5iCW/1zBwZh0KRp60lZ7YUTIadCzhZq2ktbYNwv+HlvCYLy5dMYv005nInj1wYJoZPXAtqWJlSbIFjh7G++iw5b85WVzMGzZ/HXGRSG62OexUr+D/S1I7H9bOm4+lTIgRbwegV8XCuKEC2xGpag+azVsy97KXnJGhSJCNnwj07zXk1NI+qLrqx9CKDZsXn7sp6eUGKPPJURMFceXceyf8kriknt7tdanWlleqRlbDljujtpjNArW4kmNfhB7es+UmBWcVWCATlM9AoMjwkrvlt9D83uNfUa+WBhhPOgDll2xBSgou0krSz+W+O4Nlcm3UMLYSR+pmDZ/9iZhIq+nS6Sluy1DTxW6UndDl13oR50jFNZW0kd0zCicnpRpk3o7W37GqFIZ8PPJ3E7fYCmW8sVx6VaUoInxMoIqv8I+1ivMGFyW7vATUM83/jJFUbe2WqmIBar9N9NNom7jWnPvnwCsYQzSNaXigdsLkDX5IFpQb0jG9tiQ7++w525v02lSCyaKHqfr3H8OpSRG/cOhHPkbpzru+fwh3XQPgW9t78LWIuONqYRfq48G82MsZksiyxSANtlAUx+/xT1IjbBkYAfb5tn1B3jlr8kR9pwbfw7sNteW143cb4OFEZGVFgh2mlSQ4qPA5hk8aRqU4OgwKBU2NWRcxZEQjHgbPq27RwAB/O583i7dLhrS8K/FhiLqp1oz7pA5PtuuOMEUogxOpOQnixhf3gqqJGoUQG125d9ie9IPX0DoSHkjl6U81dXZgPjclkSlvEU+SWsOFmXQ47Hw51LG5LC8Rgt6OJEd8qd7Y0a6+ZR4Xz3VeeIaPaSJeOpi5ImzqAtptxMkiufIAzvt6rLHyA76wA6dnSVyctd6j8Ua3z+rsF57v6rlDNsZHeBic/0hf5+ 9muLDkbV ptpf5GXRm2CAFG1GtNK3OmKee8iIV/o4A+bmTZF0gNxJ1iIzehodvQZQL/fMzTvaOwNLuBpc6z+AasfFMAxVsdmN95/dUMt8u2a06GnrLSkme2x2X/Kt09V+eTTPR0FQ+SmYgXcUm6yAr3Xnm8x/pVtb2PGf3TSSqnBSpkn3oty/RWH89DK6YWkUu4uQ5wHV1RFrkGI3TQVvWF5/O/La+z1/nYcbMQiRTXJG6+g8GEa4rxHl7PpZLb7RlRmKxMe07n2KwNsVxBh9Md9V8SRgrPqkyQ8bXHNqgERPWjkWOr0cQN78= 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: Harden build ID parsing logic, adding explicit READ_ONCE() where it's important to have a consistent value read and validated just once. Also, as pointed out by Andi Kleen, we need to make sure that entire ELF note is within a page bounds, so move the overflow check up and add an extra note_size boundaries validation. Fixes tag below points to the code that moved this code into lib/buildid.c, and then subsequently was used in perf subsystem, making this code exposed to perf_event_open() users in v5.12+. Cc: stable@vger.kernel.org Reviewed-by: Eduard Zingerman Reviewed-by: Jann Horn Suggested-by: Andi Kleen Fixes: bd7525dacd7e ("bpf: Move stack_map_get_build_id into lib") Signed-off-by: Andrii Nakryiko Signed-off-by: Jiri Olsa Acked-by: Andrii Nakryiko --- lib/buildid.c | 76 +++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/lib/buildid.c b/lib/buildid.c index e02b5507418b..26007cc99a38 100644 --- a/lib/buildid.c +++ b/lib/buildid.c @@ -18,31 +18,37 @@ static int parse_build_id_buf(unsigned char *build_id, const void *note_start, Elf32_Word note_size) { - Elf32_Word note_offs = 0, new_offs; - - while (note_offs + sizeof(Elf32_Nhdr) < note_size) { - Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_offs); + const char note_name[] = "GNU"; + const size_t note_name_sz = sizeof(note_name); + u64 note_off = 0, new_off, name_sz, desc_sz; + const char *data; + + while (note_off + sizeof(Elf32_Nhdr) < note_size && + note_off + sizeof(Elf32_Nhdr) > note_off /* overflow */) { + Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_off); + + name_sz = READ_ONCE(nhdr->n_namesz); + desc_sz = READ_ONCE(nhdr->n_descsz); + + new_off = note_off + sizeof(Elf32_Nhdr); + if (check_add_overflow(new_off, ALIGN(name_sz, 4), &new_off) || + check_add_overflow(new_off, ALIGN(desc_sz, 4), &new_off) || + new_off > note_size) + break; if (nhdr->n_type == BUILD_ID && - nhdr->n_namesz == sizeof("GNU") && - !strcmp((char *)(nhdr + 1), "GNU") && - nhdr->n_descsz > 0 && - nhdr->n_descsz <= BUILD_ID_SIZE_MAX) { - memcpy(build_id, - note_start + note_offs + - ALIGN(sizeof("GNU"), 4) + sizeof(Elf32_Nhdr), - nhdr->n_descsz); - memset(build_id + nhdr->n_descsz, 0, - BUILD_ID_SIZE_MAX - nhdr->n_descsz); + name_sz == note_name_sz && + memcmp(nhdr + 1, note_name, note_name_sz) == 0 && + desc_sz > 0 && desc_sz <= BUILD_ID_SIZE_MAX) { + data = note_start + note_off + ALIGN(note_name_sz, 4); + memcpy(build_id, data, desc_sz); + memset(build_id + desc_sz, 0, BUILD_ID_SIZE_MAX - desc_sz); if (size) - *size = nhdr->n_descsz; + *size = desc_sz; return 0; } - new_offs = note_offs + sizeof(Elf32_Nhdr) + - ALIGN(nhdr->n_namesz, 4) + ALIGN(nhdr->n_descsz, 4); - if (new_offs <= note_offs) /* overflow */ - break; - note_offs = new_offs; + + note_off = new_off; } return -EINVAL; @@ -71,7 +77,7 @@ static int get_build_id_32(const void *page_addr, unsigned char *build_id, { Elf32_Ehdr *ehdr = (Elf32_Ehdr *)page_addr; Elf32_Phdr *phdr; - int i; + __u32 i, phnum; /* * FIXME @@ -80,18 +86,19 @@ static int get_build_id_32(const void *page_addr, unsigned char *build_id, */ if (ehdr->e_phoff != sizeof(Elf32_Ehdr)) return -EINVAL; + + phnum = READ_ONCE(ehdr->e_phnum); /* only supports phdr that fits in one page */ - if (ehdr->e_phnum > - (PAGE_SIZE - sizeof(Elf32_Ehdr)) / sizeof(Elf32_Phdr)) + if (phnum > (PAGE_SIZE - sizeof(Elf32_Ehdr)) / sizeof(Elf32_Phdr)) return -EINVAL; phdr = (Elf32_Phdr *)(page_addr + sizeof(Elf32_Ehdr)); - for (i = 0; i < ehdr->e_phnum; ++i) { + for (i = 0; i < phnum; ++i) { if (phdr[i].p_type == PT_NOTE && !parse_build_id(page_addr, build_id, size, - page_addr + phdr[i].p_offset, - phdr[i].p_filesz)) + page_addr + READ_ONCE(phdr[i].p_offset), + READ_ONCE(phdr[i].p_filesz))) return 0; } return -EINVAL; @@ -103,7 +110,7 @@ static int get_build_id_64(const void *page_addr, unsigned char *build_id, { Elf64_Ehdr *ehdr = (Elf64_Ehdr *)page_addr; Elf64_Phdr *phdr; - int i; + __u32 i, phnum; /* * FIXME @@ -112,18 +119,19 @@ static int get_build_id_64(const void *page_addr, unsigned char *build_id, */ if (ehdr->e_phoff != sizeof(Elf64_Ehdr)) return -EINVAL; + + phnum = READ_ONCE(ehdr->e_phnum); /* only supports phdr that fits in one page */ - if (ehdr->e_phnum > - (PAGE_SIZE - sizeof(Elf64_Ehdr)) / sizeof(Elf64_Phdr)) + if (phnum > (PAGE_SIZE - sizeof(Elf64_Ehdr)) / sizeof(Elf64_Phdr)) return -EINVAL; phdr = (Elf64_Phdr *)(page_addr + sizeof(Elf64_Ehdr)); - for (i = 0; i < ehdr->e_phnum; ++i) { + for (i = 0; i < phnum; ++i) { if (phdr[i].p_type == PT_NOTE && !parse_build_id(page_addr, build_id, size, - page_addr + phdr[i].p_offset, - phdr[i].p_filesz)) + page_addr + READ_ONCE(phdr[i].p_offset), + READ_ONCE(phdr[i].p_filesz))) return 0; } return -EINVAL; @@ -152,6 +160,10 @@ int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, page = find_get_page(vma->vm_file->f_mapping, 0); if (!page) return -EFAULT; /* page not mapped */ + if (!PageUptodate(page)) { + put_page(page); + return -EFAULT; + } ret = -EINVAL; page_addr = kmap_local_page(page);