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 2FC4BC3DA49 for ; Thu, 25 Jul 2024 19:59:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B7CA46B0083; Thu, 25 Jul 2024 15:59:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B05A46B0085; Thu, 25 Jul 2024 15:59:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97EE56B0088; Thu, 25 Jul 2024 15:59:19 -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 70CD06B0083 for ; Thu, 25 Jul 2024 15:59:19 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EFC3D1212CA for ; Thu, 25 Jul 2024 19:59:18 +0000 (UTC) X-FDA: 82379339196.17.2A26BF4 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by imf07.hostedemail.com (Postfix) with ESMTP id 26AC740020 for ; Thu, 25 Jul 2024 19:59:16 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jCN5B78t; spf=pass (imf07.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.215.177 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721937509; 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=YJ3tvD8Nb8fNSpovx5H8fGMVhMUJOvDNuyECpxv81jg=; b=jVjwAohnsnCEQ90CbblAu8XzWCYJcZLNh5oTf4ago0GQm0Bwji3ooHTQTkLkHOyrrket5V cNjNOUD2L8rAjwDEu7pvSHhOs++Rk5Sg3pG4U2ykEyv63ACyNsIi9mpeXLfm+UcYcsd6De dy6zeMyMG5RaJNacih2NbSLRZhCDvMA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721937509; a=rsa-sha256; cv=none; b=Qat3YIT/9GQvFTDTnsUg0aQ78dEw1D0KrRtaJtEMNPTzShsQtlVCTx0aJrw+EaTiZixJQA dF+VewvhoQSdIThHq3wUjVylfLkevp8fRozkJk91s7Bp3o4qMNXkeAgmira66i386Gl5wc hjEB+tef9+E8n86snSmm17Op7qG+toM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jCN5B78t; spf=pass (imf07.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.215.177 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-7a0e8b76813so160271a12.3 for ; Thu, 25 Jul 2024 12:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721937556; x=1722542356; 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=YJ3tvD8Nb8fNSpovx5H8fGMVhMUJOvDNuyECpxv81jg=; b=jCN5B78tTZC+NWAwzKIEaxYAN9lFO7U5Nd41RSp+kMIF4oDGNJrWIaGKy+cJZfdXBm wKpjTwmn1ZnAv5KNR+Vx+gSYHsSviAeAU+BDS05s5XuvBV5d0SP5h0qE0ZlfnbUX3GAx ZRY/GuYSUzEcrJW+8cyVUVkA0W/COKegcPLJJmJHgFHd5OQPpJKk90mt9lR04S8KfwvL ZlyyDfx1OHPDfSXIi8ncjSVxgDlBLaTUehYTdnfdH9oLocLuGGXfVeGCy+EgW4pVJ3OG /+SN2/eyc77UoUPlzxM480Q3xFYGesoTJZgZhR7dEIFSJEjv/oOdpAeT2o5mlBYRJqSg /8Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721937556; x=1722542356; 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=YJ3tvD8Nb8fNSpovx5H8fGMVhMUJOvDNuyECpxv81jg=; b=IC/LHuJWo54NEgYAa3rqwurTpgW++fJgwTjT5bWY5qtgAK12vXC70VjoIdbt05JASx ZgFZl/jfkgxNe8CO8v+h8AAR05N2L1IziSnry/VjZXEBPPtjak4YKXt9+Ea6vn+o9oXm ue3jnpuano3T5HS1ySGij6q2lyY/BGWXB8WAowUgq0ZFvVJVaS7gG7XzH50DcFrO/hGD 3TUIE9OVzZDe6AbkvYfO03ke+wdAZRsiDjabbpU8ehQHERFR3tG3vX7t8t7s0cP6YwsT 2qKqfBO4PrA5maAH/DIOzzr0466Y1fZZ4YMebIgyNfZHtcIonOcYYH0kDMTUIZJ58Ld1 VHCQ== X-Forwarded-Encrypted: i=1; AJvYcCU0EYcwaQfMBGkIpwt/NxfWpv6ru3wQSxrqUuss7L5Bnwm0sVxMu9IlR6NWiwS8t7NOgKhmbPECkZObHVuB2fLwHj0= X-Gm-Message-State: AOJu0YyDbN93BqGyXrVBbXMdzlWuDy52SQc27xJzXVmvwzpCSz8keiQp fPuRtmMgvFMtq4Wvk4t07i7/vAP/8UfLrVfanxPVyhngAj2a976jtNjNB+kq1YSc4wicSbNymit 8PrWw0/StStUf9XzvJJLO8xsrcph2DDfr X-Google-Smtp-Source: AGHT+IH+fPJMw6P/FCDHkAW0fTmIC2nOPhUKibo8QSBSkNSZq8AjiBXXdneNoZidydWm9Wvn81AJQJlVxMC9jsnWJ6M= X-Received: by 2002:a17:90b:314d:b0:2ca:5a46:cbc8 with SMTP id 98e67ed59e1d1-2cf2eb8440bmr3272362a91.26.1721937555850; Thu, 25 Jul 2024 12:59:15 -0700 (PDT) MIME-Version: 1.0 References: <20240724225210.545423-1-andrii@kernel.org> <20240724225210.545423-3-andrii@kernel.org> In-Reply-To: From: Andrii Nakryiko Date: Thu, 25 Jul 2024 12:59:02 -0700 Message-ID: Subject: Re: [PATCH v2 bpf-next 02/10] lib/buildid: take into account e_phoff when fetching program headers To: Jiri Olsa Cc: Andrii Nakryiko , 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 26AC740020 X-Stat-Signature: 6ht6exfp1t7ewjirjday6ykwenowhj6j X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1721937556-308987 X-HE-Meta: U2FsdGVkX1+QKuTCq/q/kgTVPtHk1Oa97Pu+7lj+u8tWPJPHoP2coqSBLiDq50aW9uS0cJfU9Uzv8kNdhvKNBIxwKkmTO1a82sHZAiL75YvvpUqKb+1Mou/VJpCZSXRhOkS98+HOgeeeNJpv2W+pa48oOrXqYhPIotKjICS3DvIBa9fCNG36y3+Qz5EH09m/Ss6mrOJsnH20fYMeudQQ+Fxmln09CpdrhrEAWGTPfbqJH7YupswnFHi6DIZWKdVGZr4AZFKAMDwQL/aKMo3f+If4Laxm2HHOiNw5MS463kj3x2Mt0rmn93qUbiwEYzF3d7OfPhMvgj3Sdy1cj4ylxV6IOYBWzeqlYMPstS4vH29cfmaz+W9pG7lg190SMsC2y+sJ1BZCQQIkFy5Z95WsS/HfuPRjPVvIFHh0yAjOX2WdHZs585H3HXjS5xp1gxRrR15LMaOt2kU1WAfqR3+79xSj4zjqEhakkkgny1KCBVaZ8Adm2Y3Uzb2BgQOlL9LvS4Ecf/2FKr0Vf7Ijcud+F4FSUubxEoUke4661yj5J9abmHYhjM8HGINW/ciIU8X3bHyt0y+HA0Cqs8UWdMi9dQ7LTjVZnaXEbA2KsnT+KQkPju9EpZn7oQk6yfi2EF4rNIr/NjimgKIGqS0/nwhZpNFyN+WNIuUnnmwcvF4JeNI9mvInpbiUS2Je1GeYNHz1UxzJJFyJK7W1xdaoax6HEDPf1vBXSTJtN71LV9fzPjbgidpLLwNz4VNw1edbS1wYiYFCXrObPCfTMmA9Jl3s14Yk08XtJSXY0cVq+ovg7TcsA6NCDD031FJTHuqntluLRjLS2w5GnottI3XlbOckRlNRM+n6Mf21gpmIbqAMCTM6XWouWsnDLFfmMR4WS45KIsWzpm/JYcBLJ7606pMPHD6TG56ZChXaHGXB1VYL4KqHoiRUGPs+n+4kqQTnaOwQ6CvHEHj0vb1VBGX6dnB qrDFy7r1 eoAui4PSNU/Juwy2KNI8k8KNtrrJC45jy1IuXbB4D+x2VQbZxm4sQM2YKP0oWag/AEv9yKmMWIMM871mqjzjgq4rUxhFzJ4F0uiLVg07P+GXQ4Uh6gVyTQrxDo4yRBh6yLaeJNeS+T8U6LTxAFJCkaAi076UramUIHqI0ROKKj11+zuzLQWorvt9s1i/7qmKnkEMIlDigE25uJGAFtKVASJwwEz22Sg1O1N6OTb07QnWzyYQSATe0+S85hyrA3Jy6Ww/VSDNtOGHrDIyWiGLn6guVTCHTom5dKxa2JdF8YpkC3o39fGGyJW3J8HJfe94I0wplwM9liLDql7B2XCTJ+jjPPAUd91D/cfSN5zi0KkHKujDur65bYimehwaF9c7M+4m9BWN4HQxp1g1ae+lJKvn+FUOB4W9ZaP+HIAMB1lnGtdsug3EIYJX6Sj/JA6Nseg59IDjalASf8IU= 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 Thu, Jul 25, 2024 at 5:03=E2=80=AFAM Jiri Olsa wrot= e: > > On Wed, Jul 24, 2024 at 03:52:02PM -0700, Andrii Nakryiko wrote: > > Current code assumption is that program (segment) headers are following > > ELF header immediately. This is a common case, but is not guaranteed. S= o > > take into account e_phoff field of the ELF header when accessing progra= m > > headers. > > > > Reported-by: Alexey Dobriyan > > Signed-off-by: Andrii Nakryiko > > looks like this one never got in right? > https://lore.kernel.org/bpf/CAEf4BzaAKAwO=3D-=3D0qZQfkHhBodN0MQUHpL-RY7= tCHdcFidjv-Q@mail.gmail.com/ > > I couldn't find the place where you remove that check ;-) > yeah, I don't think that landed. And this patch set will supersede that change with a proper support. > jirka > > > --- > > lib/buildid.c | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/lib/buildid.c b/lib/buildid.c > > index 1442a2483a8b..ce48ffab4111 100644 > > --- a/lib/buildid.c > > +++ b/lib/buildid.c > > @@ -206,7 +206,7 @@ static int get_build_id_32(struct freader *r, unsig= ned char *build_id, __u32 *si > > { > > const Elf32_Ehdr *ehdr; > > const Elf32_Phdr *phdr; > > - __u32 phnum, i; > > + __u32 phnum, phoff, i; > > > > ehdr =3D freader_fetch(r, 0, sizeof(Elf32_Ehdr)); > > if (!ehdr) > > @@ -214,13 +214,14 @@ static int get_build_id_32(struct freader *r, uns= igned char *build_id, __u32 *si > > > > /* subsequent freader_fetch() calls invalidate pointers, so remem= ber locally */ > > phnum =3D ehdr->e_phnum; > > + phoff =3D READ_ONCE(ehdr->e_phoff); > > > > /* only supports phdr that fits in one page */ > > if (phnum > (PAGE_SIZE - sizeof(Elf32_Ehdr)) / sizeof(Elf32_Phdr)= ) > > return -EINVAL; > > > > for (i =3D 0; i < phnum; ++i) { > > - phdr =3D freader_fetch(r, i * sizeof(Elf32_Phdr), sizeof(= Elf32_Phdr)); > > + phdr =3D freader_fetch(r, phoff + i * sizeof(Elf32_Phdr),= sizeof(Elf32_Phdr)); > > if (!phdr) > > return r->err; > > > > @@ -237,6 +238,7 @@ static int get_build_id_64(struct freader *r, unsig= ned char *build_id, __u32 *si > > const Elf64_Ehdr *ehdr; > > const Elf64_Phdr *phdr; > > __u32 phnum, i; > > + __u64 phoff; > > > > ehdr =3D freader_fetch(r, 0, sizeof(Elf64_Ehdr)); > > if (!ehdr) > > @@ -244,13 +246,14 @@ static int get_build_id_64(struct freader *r, uns= igned char *build_id, __u32 *si > > > > /* subsequent freader_fetch() calls invalidate pointers, so remem= ber locally */ > > phnum =3D ehdr->e_phnum; > > + phoff =3D READ_ONCE(ehdr->e_phoff); > > > > /* only supports phdr that fits in one page */ > > if (phnum > (PAGE_SIZE - sizeof(Elf64_Ehdr)) / sizeof(Elf64_Phdr)= ) > > return -EINVAL; > > > > for (i =3D 0; i < phnum; ++i) { > > - phdr =3D freader_fetch(r, i * sizeof(Elf64_Phdr), sizeof(= Elf64_Phdr)); > > + phdr =3D freader_fetch(r, phoff + i * sizeof(Elf64_Phdr),= sizeof(Elf64_Phdr)); > > if (!phdr) > > return r->err; > > > > -- > > 2.43.0 > > > >