From patchwork Wed Oct 16 22:16:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13839038 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 B3B12D2F7D2 for ; Wed, 16 Oct 2024 22:16:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25B0F6B007B; Wed, 16 Oct 2024 18:16:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 20B546B0082; Wed, 16 Oct 2024 18:16:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D2936B0083; Wed, 16 Oct 2024 18:16:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D9F7A6B007B for ; Wed, 16 Oct 2024 18:16:39 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F15A0AC230 for ; Wed, 16 Oct 2024 22:16:18 +0000 (UTC) X-FDA: 82680875172.17.A9B0942 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id 727EC100015 for ; Wed, 16 Oct 2024 22:16:27 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="r4XP/+kR"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf14.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729116891; a=rsa-sha256; cv=none; b=ZOIg36TjTYXr5jIiH0rEJbUf2xKhLJPNFGTHFZpdnYqDwqjsknYZkn4ZjtKq2H1b8isXB3 i2SmVkFQCP5secmy81uVC7bMWaUHhlham/Y0uxBCrM0KTWbjZ7tAfo8eBWdUhk3kxnR4ZD hB/+0RQb5tApOtAB9F2RzZPiyYcNW80= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="r4XP/+kR"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf14.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=1729116891; 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:references:dkim-signature; bh=b7VAQyWN/xVJNSu/EPNl4krf7p9EU9cPxoT1swWb7mI=; b=Ze8f6ehow3Ogy145j+CiuJFNUplHhgBIksNTa6NW1V3U+q3icm/l9ijwjy9U47itV3xxwY IxcsCcROhggrTi8CgPnPFIKPMa8bDq0zuu1xYIsCQENhSL2eciL0kZhaFuYen9usorOY/G ovvvFDgtUCSLV+nfepthsUkyGH3BsH0= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7F4625C5840; Wed, 16 Oct 2024 22:16:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FEC0C4CEC5; Wed, 16 Oct 2024 22:16:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729116996; bh=mIZnrqKm6DZOGB75fmkZXzLmh3/McYTdxYBRYOABlQ4=; h=From:To:Cc:Subject:Date:From; b=r4XP/+kR4l4ZnSbFOsJQVy6T1wlV3pn1GU//zOndpV7DNj+ZdjkHWrO+YwqarleIl LprIwZQwPOyIgMMSp9Z0kXgk54qbCf6WD2KyOm7HTy5YkhW7spuHN5NycAyCjB/ebJ RqXOHEFb/wGImRBbCKob9bWiUyaffB5RA1LRH7T7mLV9aFQzdbfHzwV+2YzzmwZJ0G iOyahT74rqFYCP/YMYph5fQtdrOwwlf0UqK/lHc22FWX0j1N90l31MJspfufW0RoKy 2BFUtl7IJYN6DIOrFf/QWYPHNfs3rVjfjezw38pCWU9kNXyVcEuEsILCRFPHjJEhkz yGzGQlxdCL1EA== From: Andrii Nakryiko To: bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, martin.lau@kernel.org Cc: linux-mm@kvack.org, linux-perf-users@vger.kernel.org, linux-fsdevel@vger.kernel.org, rppt@kernel.org, david@redhat.com, yosryahmed@google.com, shakeel.butt@linux.dev, Andrii Nakryiko , Yi Lai Subject: [PATCH v2 bpf] lib/buildid: handle memfd_secret() files in build_id_parse() Date: Wed, 16 Oct 2024 15:16:29 -0700 Message-ID: <20241016221629.1043883-1-andrii@kernel.org> X-Mailer: git-send-email 2.43.5 MIME-Version: 1.0 X-Rspamd-Queue-Id: 727EC100015 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: oxyurtd11i4bheah4zaf7exyuf5ae39a X-HE-Tag: 1729116987-192245 X-HE-Meta: U2FsdGVkX1+7jZ7TaAPze2HHwtb6XC9CxUOLiJ7blJRVyL2TbcZ44JBsyHx9190eOuZCr+8layurkTMlws6hErTMY8BKDoozeUV6m06thrncWe9A6EcH0MkaqaaqYjOuKKU+bX+24NRrYtaLKGEyaZ0f92pGLflNtp4gzdt0mlclNBMm4Yty5WNcS0kYYnKAHmozo1QE5R534npQy8ct+w9pfAfw+WpELgEonArL1/vQc/SsADbNOESuMtAm4ju7xh/AIlcnpeSXxZmsz5du3X3fUcDvPbXcjRr8ixm5J8jBplXSmo3B6oq6fGKifn/hqQZIsvd0UwihoTTN/54sWumta/D+X1F+xBRx6T+MmOqHKpOxB5URwJpGgtxmvoEno9fyGNdTnYaxQBt3haziZoSKVVoQoeMB+rpkY3QKqYhkszN7j0ToMcqwXvWw9M7FFUm/8satNmvrdU+dWSBvIy2dASIn9zCvhQhuvA2/vFjbzqh+pIzlaw7/iEfDwG3UjlGGpcpsxIq4vE/FMfwvcPuFIcrLxya5+Gx5Ve8aWxljx1jqOd6SXSy/gD1j0Nd86sVwAtENNiznx9HKBit50NBwqAitGbvqnoD4KSwhLRvrqBfmBOad0Y0ZyPWrX5NWrIjoknOAHrtjMvUAiq8tD/gcWBRxrbD6ESM0XT62SybVYK2/pHoZG5qqHF+7VCFmY+WPAFnhf1w5JUXH6LSbcrom/WS7vlUzRvim/NAe1wXLOYYM59GbzMD7hYk/ZQQPDjPcUMNcAeutz0wywfgGqdifpbhOyCmOSU9ueaQRezNmQP7KDz7Bi8qAJ2E2IOOGqX5/sW8nc8fVEaajSSTi3h8gKldrBW159iHP+NBLZzBsYDiXTQ9qLki/Vj9EyYP/A9SdsAJyTmB/yAq8v64y7vvkSXMKlo2xS7pWD93XgfTNZK/NC3kim1AMCRFcLudR3EWWxkZ38F2eCWflBjh zj5z5NIN zjgOFT344YpTL5/OrKglGEvWs3BH4hjVyUmu5OhJxPZ/Fe2yCCxSaQatVjs8tKHtWF7Xg82QkH7AIpe4bLJzxrQggaMg8RD7qR1YVYhyKJG3qZX51pawEyKYt3Pu0LeKFU0h/50tpZNbnolXR2BY8xnjTgCUkcNwFQuv/SQENhyvlLleOInMiShXDE1s3fM4fL5d9Eas1SL8Q0ZzBXWNbRn3Uc0YXtOe60t1unAKWP/FdD7yZ2P4fv8VNqtOborLZuEYXi2smSIpe/KJIoPCjFzfWg/JCUHhLe54bGXurnpoFwca593l74yo1yq5MA8Z/eMrBOVvtriOx8VjEwXPT0I88ucGKwJX2lHEm 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: From memfd_secret(2) manpage: The memory areas backing the file created with memfd_secret(2) are visible only to the processes that have access to the file descriptor. The memory region is removed from the kernel page tables and only the page tables of the processes holding the file descriptor map the corresponding physical memory. (Thus, the pages in the region can't be accessed by the kernel itself, so that, for example, pointers to the region can't be passed to system calls.) So folios backed by such secretmem files are not mapped into kernel address space and shouldn't be accessed, in general. To make this a bit more generic of a fix and prevent regression in the future for similar special mappings, do a generic check of whether the folio we got is mapped with kernel_page_present(), as suggested in [1]. This will handle secretmem, and any future special cases that use a similar approach. Original report and repro can be found in [0]. [0] https://lore.kernel.org/bpf/ZwyG8Uro%2FSyTXAni@ly-workstation/ [1] https://lore.kernel.org/bpf/CAJD7tkbpEMx-eC4A-z8Jm1ikrY_KJVjWO+mhhz1_fni4x+COKw@mail.gmail.com/ Reported-by: Yi Lai Suggested-by: Yosry Ahmed Fixes: de3ec364c3c3 ("lib/buildid: add single folio-based file reader abstraction") Signed-off-by: Andrii Nakryiko Acked-by: Shakeel Butt Reported-by: Daniel Borkmann Signed-off-by: Heiko Carstens --- lib/buildid.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/buildid.c b/lib/buildid.c index 290641d92ac1..90df64fd64c1 100644 --- a/lib/buildid.c +++ b/lib/buildid.c @@ -5,6 +5,7 @@ #include #include #include +#include #define BUILD_ID 3 @@ -74,7 +75,9 @@ static int freader_get_folio(struct freader *r, loff_t file_off) filemap_invalidate_unlock_shared(r->file->f_mapping); } - if (IS_ERR(r->folio) || !folio_test_uptodate(r->folio)) { + if (IS_ERR(r->folio) || + !kernel_page_present(&r->folio->page) || + !folio_test_uptodate(r->folio)) { if (!IS_ERR(r->folio)) folio_put(r->folio); r->folio = NULL;