From patchwork Tue Jul 9 20:42:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13728512 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 DEAF4C3DA42 for ; Tue, 9 Jul 2024 20:43:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 720526B00A4; Tue, 9 Jul 2024 16:43:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D04E6B00A5; Tue, 9 Jul 2024 16:43:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 570306B00A6; Tue, 9 Jul 2024 16:43:21 -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 3677F6B00A4 for ; Tue, 9 Jul 2024 16:43:21 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 01194A52D0 for ; Tue, 9 Jul 2024 20:43:20 +0000 (UTC) X-FDA: 82321389402.29.6AABC75 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf02.hostedemail.com (Postfix) with ESMTP id B2A6480011 for ; Tue, 9 Jul 2024 20:43:18 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=FT3VeWnK; spf=pass (imf02.hostedemail.com: domain of andrii@kernel.org designates 145.40.73.55 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=1720557768; 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=/p3ZJQXLxqxZi0QU2VNC5Qt4CTeV7snF007YBX98Nf0=; b=ugPrBIskLbVhnkR2e+E5HsMJNKzV5NAPe1cyVPNnOn4ZqXdDtlzE/RYGttt16GF9ARIyf8 ksokArLfvHBW8bFL5uL9pXTcLU9j5rwgKdBFN1yPZeClEex4z1hRTkfpMwth3mPwtHc7ea Wb+NMIfaiZRTLZN4+eXFWDxGICo+NNk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720557768; a=rsa-sha256; cv=none; b=J2yjHKzlr6oU9FAgU4YoKzDg6QHrQNA1BxJcIi1pTi4Sljr0KVYKs5DsEdpxest0951dGh O/PnCtNl+j5vdc0XGFgVNGew5Rz8vp27cjGraThMETDkwjXPwfCUSy81lE45fFOqOY6g5g /hfopweVjH+JUzo5jjGmaqD5j9i9/M0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=FT3VeWnK; spf=pass (imf02.hostedemail.com: domain of andrii@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id BA55ECE12E8; Tue, 9 Jul 2024 20:43:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEC70C3277B; Tue, 9 Jul 2024 20:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720557795; bh=ntgIIpn+tzkBcO08o2+RKeRyEZVireJUIPte90Dh4v8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FT3VeWnKtWaL7Gbbv2pnSaxMvBXc21UChw8rj1kgj/anWnhmDG4nwXOHcG+aOzxgb VotIDtFAfz/XE8izfTt3S08+En+tj7Zfcw6vU8EmRqR2ssaVUwDiyBucSYBmlVUNTu 0i3d27DXzO+uKIVH4TKmPAdzahRpg90xGw+9Yb/MYeHAahjEF9B38Rhu2/OHQsyp78 MyOiFFwfoKzGK+pGBwc1paG/8eI7Esy+Vv7SsCwHmMDh5UknwSbdUdKSF9JW7mFKBH STzwdtinTGuqEnzure0ARFMPb3GcBUlc/hW6nUtR+sNSg3hufnwOL2JBFQE3OnKUjr yGjixGGcAaPfg== 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 07/10] lib/buildid: harden build ID parsing logic some more Date: Tue, 9 Jul 2024 13:42:42 -0700 Message-ID: <20240709204245.3847811-8-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-Stat-Signature: nqhbcecindkwwcqey3gpoqhohrb8syxm X-Rspamd-Queue-Id: B2A6480011 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1720557798-317974 X-HE-Meta: U2FsdGVkX18r+TTLuIlN4Irq6Qyjy9HgCUo9XOisZp4eQRznfQoDuQQRVW5QzHPi85xB6AWBLEqND9FvWmPgqyRp5qFYnl2HdEVD2Mj9G+68lLhVS2k5v9KNTh2rvZqLb/HD7nFiGLy/Nwsu3N9QrXduyjcqAHSyoRbzU1ulxbLKpevWjH2XOsAjhKuD0jt7hynzJWt7SS4NDCEZUBBpXm8Fu6jsDrG2FoOFVgcs+199jAWVFXveN+iGmf4XL0MOZwjAyqCCnWRPxc6uyp9Rky4DjhYhB+oqvOkzT3+8Z4V6mzEqRTYJCMf5Q5hAXhNFreUfw9BApPc148dN49EgwZtlWp4mPgsfWHCFKMkWYV3W3vBtCKm839k7JwhcMr9wQpO0g8jABUlPnJp+o8rL1C2aX8RfWFXlzCxm+X7WnhgpZKGm4xM2loxn+JOKmVMXtBgchWOH0rDbNB/oPsQWwTqsbSQrGS0088s0i8pwpOMzD1lyFCOvky8Ci8YK13fT1EUImpr6WCziJb9+yAymvwFBfcQyezyxrgvLGH109ciOFtJWrUJceyJa0smoZM2z7LjvNEMhMBhtIA/NiF64oXxYhI+9xGlDyB2n4l5Tk7kghlTTWegD2oYFPJGkfrlwO26jOGrLmjlwkbS5hAuBFPkV7VxvG/qSEknCmP99paCwfeygr5XJMhnJ7tejW476PPFk0I+NcYJ6PbFFKaOIKSHtC0NmvAdoyb9Rq9/iAfcL9cgmj0vXlWQ2BlUnUkzDaw/qZ7LXjWfQ8t4chimN7jf7n978DIn8/eEBkFoEChKWDH5TFgwrLg8ZpaqNt9S+VcSfmBLIqexFUYxUmKqaLQt2BTB6CG+GuI4swmua2+2MwEZz6407jMqXjRd4u/AdYFeJUawmtqq0eWr8tXe98XtT6OIwDR20Pc6jimcGN1V0ozN5ywskVRuPVlMPKs6jBtLAYWyamkAQwo08LoA 5cTH0NCu jsmCG1jD9XOAbnlhGBlWLGIMxvulf/IKglSANYaFETR+EGvY0rRmC/QthiAO4E5xrvvMnniRqcBxoL68cCxzbWwBE1fLrb8iNqi6PnUvsHoSzYh5PJ0gkIHmA6aaIQTQUiQl29T1YUMQxnuf4q3gxHq4WVj7r280nIPyesZQ5OQ6q6tqOCwxLr34u8KZ0xCzNDxM96Pdbav8fRszmxZrcKK5+0L2gnNG7XINpmg7V1FJSjphsHthkDpBU0p8dRAVJx0Gq 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 some more, adding explicit READ_ONCE() when fetching values that we then use to check correctness and various note iteration invariants. Suggested-by: Andi Kleen Signed-off-by: Andrii Nakryiko --- lib/buildid.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/buildid.c b/lib/buildid.c index 419966d88cd5..7e36a32fbb90 100644 --- a/lib/buildid.c +++ b/lib/buildid.c @@ -158,7 +158,7 @@ static int parse_build_id(struct freader *r, unsigned char *build_id, __u32 *siz const char note_name[] = "GNU"; const size_t note_name_sz = sizeof(note_name); u64 build_id_off, new_offs, note_end = note_offs + note_size; - u32 build_id_sz; + u32 build_id_sz, name_sz, desc_sz; const Elf32_Nhdr *nhdr; const char *data; @@ -171,14 +171,15 @@ static int parse_build_id(struct freader *r, unsigned char *build_id, __u32 *siz if (!nhdr) return r->err; - if (nhdr->n_type == BUILD_ID && - nhdr->n_namesz == note_name_sz && - !strcmp((char *)(nhdr + 1), note_name) && - nhdr->n_descsz > 0 && - nhdr->n_descsz <= BUILD_ID_SIZE_MAX) { + name_sz = READ_ONCE(nhdr->n_namesz); + desc_sz = READ_ONCE(nhdr->n_descsz); + if (READ_ONCE(nhdr->n_type) == BUILD_ID && + name_sz == note_name_sz && + !strncmp((char *)(nhdr + 1), note_name, note_name_sz) && + desc_sz > 0 && desc_sz <= BUILD_ID_SIZE_MAX) { build_id_off = note_offs + sizeof(Elf32_Nhdr) + ALIGN(note_name_sz, 4); - build_id_sz = nhdr->n_descsz; + build_id_sz = desc_sz; /* freader_fetch() will invalidate nhdr pointer */ data = freader_fetch(r, build_id_off, build_id_sz); @@ -192,8 +193,7 @@ static int parse_build_id(struct freader *r, unsigned char *build_id, __u32 *siz return 0; } - new_offs = note_offs + sizeof(Elf32_Nhdr) + - ALIGN(nhdr->n_namesz, 4) + ALIGN(nhdr->n_descsz, 4); + new_offs = note_offs + sizeof(Elf32_Nhdr) + ALIGN(name_sz, 4) + ALIGN(desc_sz, 4); if (new_offs <= note_offs) /* overflow */ break; note_offs = new_offs; @@ -214,7 +214,7 @@ static int get_build_id_32(struct freader *r, unsigned char *build_id, __u32 *si return r->err; /* subsequent freader_fetch() calls invalidate pointers, so remember locally */ - phnum = ehdr->e_phnum; + phnum = READ_ONCE(ehdr->e_phnum); phoff = READ_ONCE(ehdr->e_phoff); /* set upper bound on amount of segments (phdrs) we iterate */ @@ -226,8 +226,9 @@ static int get_build_id_32(struct freader *r, unsigned char *build_id, __u32 *si if (!phdr) return r->err; - if (phdr->p_type == PT_NOTE && - !parse_build_id(r, build_id, size, phdr->p_offset, phdr->p_filesz)) + if (READ_ONCE(phdr->p_type) == PT_NOTE && + !parse_build_id(r, build_id, size, + READ_ONCE(phdr->p_offset), READ_ONCE(phdr->p_filesz))) return 0; } return -EINVAL; @@ -246,7 +247,7 @@ static int get_build_id_64(struct freader *r, unsigned char *build_id, __u32 *si return r->err; /* subsequent freader_fetch() calls invalidate pointers, so remember locally */ - phnum = ehdr->e_phnum; + phnum = READ_ONCE(ehdr->e_phnum); phoff = READ_ONCE(ehdr->e_phoff); /* set upper bound on amount of segments (phdrs) we iterate */ @@ -258,8 +259,9 @@ static int get_build_id_64(struct freader *r, unsigned char *build_id, __u32 *si if (!phdr) return r->err; - if (phdr->p_type == PT_NOTE && - !parse_build_id(r, build_id, size, phdr->p_offset, phdr->p_filesz)) + if (READ_ONCE(phdr->p_type) == PT_NOTE && + !parse_build_id(r, build_id, size, + READ_ONCE(phdr->p_offset), READ_ONCE(phdr->p_filesz))) return 0; }