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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 594D6C52D7C for ; Tue, 13 Aug 2024 20:59:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B66C56B0083; Tue, 13 Aug 2024 16:59:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B16F46B0085; Tue, 13 Aug 2024 16:59:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DE8B6B0088; Tue, 13 Aug 2024 16:59:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7E2FF6B0083 for ; Tue, 13 Aug 2024 16:59:57 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 36D4D1C40CC for ; Tue, 13 Aug 2024 20:59:57 +0000 (UTC) X-FDA: 82448439234.17.40144AB Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf13.hostedemail.com (Postfix) with ESMTP id 677F020015 for ; Tue, 13 Aug 2024 20:59:55 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=nUnq29gd; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of jannh@google.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=jannh@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723582743; a=rsa-sha256; cv=none; b=6uYldW7LNbMnhbCjoXC2cp0s/uO2LKH0YJJfy8Rih56Tb4aT1TkAlA18NmozIKdkWBx+Lf efqBQO9Sx3rjkICjXjgR3unxufQaRLsuT34Buzt82PpYGNoBt6m9rKk53D1lJdm2VKmAKe QJvTfIqOTtR1wRsO039857hW8EKwgqI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=nUnq29gd; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of jannh@google.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=jannh@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723582743; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RhgGYVMx+jW9NS5avNe3UcbWXP3uzGmp3M9nSD5W+Bo=; b=PbidSOCiLUu/TIhJldPmIz7aVRPG8hWNDM7mPMRUwB7KY6cCD+0EG+Qk8dpBRMdC1VvinJ JR+9vDBSRy9NHMBmXz+SzXlrlY3LXnUldEAK4XxwsLLC/PHPPsTTxYsENlk72VJxK6Xuzt 1yW6GNR6Y0haQEGAg9Qf1tXZeieS+f8= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-200aa53d6d2so27365ad.0 for ; Tue, 13 Aug 2024 13:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723582794; x=1724187594; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=RhgGYVMx+jW9NS5avNe3UcbWXP3uzGmp3M9nSD5W+Bo=; b=nUnq29gdrt4ymxHBpLCIbCbYfqYUHV/KG/VNlXRDI9/mPacE773OYucvL1QJduiRJu 13tPQqsmb8qoI4St8oYV4OoPmzgzVl4SezwlrxMCya32V8PBp4mS7ToTNfAXLbeSY1zD v4YQ68mP5y0lvHH/QqXo/gn5hMC0Ce4SB0v8Gsfc6yrLijnw2tJuG0d/MiocFX4rIKV5 FXI2axkvnbwUQRNq7pXTGm17+jw2ee2OA86qiJZnhxNqZHlNmwi4WX/vdrhShBfUaXaV NytL4B+CjGb3YlgOT6b/mEqKDF0eKNo9QrqGhg5kieK4mlIA+s5kfUhKi7yhwx5977OU u5uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723582794; x=1724187594; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RhgGYVMx+jW9NS5avNe3UcbWXP3uzGmp3M9nSD5W+Bo=; b=q1zehyApFjaRVVYbe7H/UW0Ex/h4GOqOg4W3KQV/cZFQi4NJWye/UPAn2b9GuKqt8D X4R+/RsZqmvZS8h5iQbeqYPMcUXdes0KbZKdJEJIHbrEYqUwQ391Lq/x2rVQhckdZ2O2 1+to4dZ+Uc255Uk1j8DBiIxCwCIWyIDp3vlkhgFSY+dGuZjdV3yDWiBjOQgvYAUTQoWO R7cYMLmnW18VSHhe+f8HBGTEJZXlsVnZ3Gg/7QjyM6FThTunbbqU0hZ6PWXjK0ekM1Ct G0jXL5w3VjZ0BEHlgVenlEOjtbL8VYDzWe88dd3l0iDUtVxjJNOChUW0M848MqesK20K 67SQ== X-Forwarded-Encrypted: i=1; AJvYcCUtYhgFHjSRwEhBO9bg/HjoKJ4r5F2ZkGYHG1DgzroIougyGfQB6GZtokpaaovoMJkC6C30qNL/hirWiGFnRcSWPqY= X-Gm-Message-State: AOJu0Yy4dz2OyliVneRJ+l5FimFYzH6/7tvOPH2YtNWA5cQoBUu+pP1g 5ANAxLJUEwwHYAq0F20Ae6NMA7e5bHGT+eoTcbYblPogMWRP3/rKq8GG85pJ967/VfC1GeEkeeD j8Usl7hVNd+CKL/jTLhPUXjIEyn/CKO9nsBFm X-Google-Smtp-Source: AGHT+IE7evxZcY5Q1trGPNN8QB7kOuoEiJu2YVj+e1IaKF5gw6xisj04CQzafN0peuVm9S/Q8W+/NmStPFUsjWgQGzQ= X-Received: by 2002:a17:902:c949:b0:1fd:d0c0:1a69 with SMTP id d9443c01a7336-201d9261633mr66975ad.9.1723582793740; Tue, 13 Aug 2024 13:59:53 -0700 (PDT) MIME-Version: 1.0 References: <20240813002932.3373935-1-andrii@kernel.org> <20240813002932.3373935-2-andrii@kernel.org> In-Reply-To: <20240813002932.3373935-2-andrii@kernel.org> From: Jann Horn Date: Tue, 13 Aug 2024 22:59:14 +0200 Message-ID: Subject: Re: [PATCH v5 bpf-next 01/10] lib/buildid: harden build ID parsing logic To: Andrii Nakryiko Cc: bpf@vger.kernel.org, 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, linux-fsdevel@vger.kernel.org, willy@infradead.org, stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 677F020015 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: oui1ztgq38psrs9sfzfahazx1s7cm77f X-HE-Tag: 1723582795-343110 X-HE-Meta: U2FsdGVkX1/ngd2gYWl8isyEV7MIDOdbH63jVGrdietzLpVwGQi1L1X/QJ7nE+gIJ38k+DYRg40L5n6aIXSh6Tqv5jmR1Uwp30yGb0GVEEGO2bvPpaKbDwsMgzDjF1sfZbKRKqluTE1Tb+bmRlSQ7PofBw21UGVSSoGBmW97e7IjBUMwB3RnJBs0tnEIUXM5EZD4dvLdJjm0BG1KS/+RZ27kNLjnsJm49e7hX4zbybrizFbz7X2+QbITBUFjtHRRVHdWM7sT+1i4PmU2mA5bO8IN6cwa5xhFewUHfgpZnlkuwAf8Nkd4pmtReMz/imkc9vJ4hW2Ei/ZJQa1wwy9sLeeL6o1mRn0C0ukCziesrt44xcUQ4N6gzZfEYmUCmwv1R7oaN8jor94C4iemzTZSAWNQm6v+X5/oSePayxGHbL0DnRYp/o8NB/K/SXf31b7016eByxFUpuGaJWqD4dfI0pCoX0oDRg2M0KWZvb2QSTaNx908oKRUCaWqPdM2yYzZuUhqyRlBgejBmGO4XD4EgA1eYAPhc10TqTIQHHALZ1dIjie7KZ21PlrD14lNMUZgXxXZEoybGGmjtrVQ8Xne4T0NbQTe5l9DPflvEoi7r0jD67GOPc5f/4PBnn6fgGlkR1GT5CN5jch7P2H4dkuFBTFJjBc/B64VqXsd0YQJpwgOYlX6EqLEXyUMaBjVKbeg9JxjsjZz0BIi0tXYEIvpygFzwd1uR/gBc+TSYGnrY/uAgPo/BaSntts3W/JFHZZaQQMd0dhMxv9hv6Umis6aDtz+3p/1efOUIFgvu6cvA7pi8IBILUz7kEpwOY7YNa4uhYVL0143tItl1R8BAzucRISp5OjMGD4+y2/0nAwV7sMCrMKU/bgFrtrUh9+HGgleqbTP5H7+OvGFJFRd6PBl66ChYxCF9qoD41V/Bj7DCsDOET23MGysUu18pBG1vATn6PeOHCiHS/JqDuoD0gT K8cMqXUg EL+myiRDmeIAik2lFLfnNtGwLQLTVH5kGJq4xrfuA78BopiWlTFhtc1dpeSu7ox8QVTCkMZaxqjXvx8oB0Hd4AylHcxxIaj7mdsainNJkS4jrqANOvsNsjwHcmxN8plFYGJ3FIrBYJwdJesJ2rPvAzHzW38pLRbmI2/JY+v5SuqFIks8ufTXv+YskQDgq9jxFKk1+tf4J9V26YGTT9nT1KWEwt4Ow27K7Wp00Pm2zMPkc8+dXcCxDeozOTV4aVcV0F7h1 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: On Tue, Aug 13, 2024 at 2:29=E2=80=AFAM Andrii Nakryiko = wrote: > 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+. Sorry, I missed some things in previous review rounds: [...] > @@ -18,31 +18,37 @@ static int parse_build_id_buf(unsigned char *build_id= , [...] > if (nhdr->n_type =3D=3D BUILD_ID && > - nhdr->n_namesz =3D=3D sizeof("GNU") && > - !strcmp((char *)(nhdr + 1), "GNU") && > - nhdr->n_descsz > 0 && > - nhdr->n_descsz <=3D BUILD_ID_SIZE_MAX) { > - memcpy(build_id, > - note_start + note_offs + > - ALIGN(sizeof("GNU"), 4) + sizeof(Elf32_Nhd= r), > - nhdr->n_descsz); > - memset(build_id + nhdr->n_descsz, 0, > - BUILD_ID_SIZE_MAX - nhdr->n_descsz); > + name_sz =3D=3D note_name_sz && > + strcmp((char *)(nhdr + 1), note_name) =3D=3D 0 && Please change this to something like "memcmp((char *)(nhdr + 1), note_name, note_name_sz) =3D=3D 0" to ensure that we can't run off the end of the page if there are no null bytes in the rest of the page. [...] > @@ -90,8 +97,8 @@ static int get_build_id_32(const void *page_addr, unsig= ned char *build_id, > for (i =3D 0; i < ehdr->e_phnum; ++i) { Please change this to "for (i =3D 0; i < phnum; ++i) {" like in the 64-bit version. With these two changes applied: Reviewed-by: Jann Horn