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 E5C7FC6FD1C for ; Wed, 22 Mar 2023 14:19:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1818B6B0072; Wed, 22 Mar 2023 10:19:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 132E06B0075; Wed, 22 Mar 2023 10:19:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F14F16B0078; Wed, 22 Mar 2023 10:19:06 -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 E44706B0072 for ; Wed, 22 Mar 2023 10:19:06 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BB728A049D for ; Wed, 22 Mar 2023 14:19:06 +0000 (UTC) X-FDA: 80596741092.27.4A226D8 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by imf10.hostedemail.com (Postfix) with ESMTP id 9882CC0021 for ; Wed, 22 Mar 2023 14:19:04 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=HtWBEQdp; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679494744; 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=cY5q38znnygXEk7MQGfhMNT6fWhXSJdRMwyHM9vnLSQ=; b=pceJII2bSMEADxOpnzhJIXAstMsXciMw9GJtIltOWAMKx+DSv9VEqcUkElp8/dIn9EOpdf GJMRXXVpkKVW9PmU4QSwtpv00P95tghIFGHs4/u8AMOurgvxAnCYe/dvhGm645imj1Yl5V moactb2RZ/cNKEHP6r12ov4gPrcvKtE= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=HtWBEQdp; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679494744; a=rsa-sha256; cv=none; b=f1WH7djU0aMqvUFpJlyNpLlYQ7FQVcW5bz5GtXSM1NXt9C96d/Oh4nnH5cHFpIN5ZVBIDJ BJaYfnsv6BI+SX7mK3eHo2odECF3Cntp+y/vlFgyOHoh7J51J+AEteuz5oGHd2bCzZZNWW CbEI6nLD9SvImCw2OToYjg6crioa6rE= Received: by mail-wm1-f50.google.com with SMTP id az3-20020a05600c600300b003ed2920d585so13133883wmb.2 for ; Wed, 22 Mar 2023 07:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679494743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cY5q38znnygXEk7MQGfhMNT6fWhXSJdRMwyHM9vnLSQ=; b=HtWBEQdpIyt5NClQs0GdEyVX0BQhYMynOh3L+SPvjL7xgirih/3eFJWoVgV996pp2F VcWMq3wYNnf2qhxaZ3BRs9EjbhpXfgwyMfxbbnhqyQNU/FRy9P9md93Rk3qN2UsRE+0G c0XyTpZPfGgcVz5nd3+agIrx68G/wVqBh0h7ac744sMSO+20LJn0uGdcSuhBMro0qe1+ VlMqfbspX9JwjjZvXUtw0gOEHFnFTBBrkOEGkfIfZ34qN16vlOQuIl5oXrWHQDr3MtJA UOEm3zuTtt7Z8SX1B/KlpSEfE4v9c7GzzDWiJFWGTHgG1CyxPEqUmLrPTq4x1i+z7Q3z YURg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cY5q38znnygXEk7MQGfhMNT6fWhXSJdRMwyHM9vnLSQ=; b=qUbd9UbRmeznFHEGj5t5Vi1GEtsZUzgkx/s85Z/wvDNxJm+vjhxmw7Ea/FSbY6B9CL z+RNWin2duPlYGnlVjLcKsAeMx2+cVsQXL4LnKde9tBW/m9cw3dA0Sy8P2e2XzE2lrGp OjSUBPcqSGa+M3n7DFYyWIZQ8eTwaiVCMNPctjaUgEs50DrCmLIwC3HbN9Emv4V3N+OI O0d7rKe/F0NdYzoAf4QrPypnDDE3ANWy3AOjpePc/KbCaJYvwmGfVSTfQeZETBXJuDBD a9ZWjYTZKcGYLWFWT0Yiq9Ags0aaFVQhg/vXmt/cmPLF2qYJhsk5NgZdx/C7oBT+zsPd Dg+w== X-Gm-Message-State: AO0yUKXyrNhu/a3j0sNvm//S+mB1DZ9Tb7Ok7B3DyVGfwDsGjZeHGsJJ R4zSmiFmAQuTXh3iX+Pu4LzSqfSMO4c= X-Google-Smtp-Source: AK7set8J49qBttZoi9GR8uqyqgWfN+x1MDD5GFiNt/4HwOkw6Rfvxx4y7uoZSw2RZCb/Jhtr8mW7dA== X-Received: by 2002:a7b:ca57:0:b0:3ee:c06:e942 with SMTP id m23-20020a7bca57000000b003ee0c06e942mr5420804wml.25.1679494742951; Wed, 22 Mar 2023 07:19:02 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id f20-20020a7bcd14000000b003e203681b26sm16872855wmj.29.2023.03.22.07.19.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:19:02 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Andrew Morton Cc: Baoquan He , Uladzislau Rezki , Matthew Wilcox , David Hildenbrand , Liu Shixin , Jiri Olsa , Jens Axboe , Alexander Viro , Lorenzo Stoakes Subject: [PATCH v5 1/4] fs/proc/kcore: avoid bounce buffer for ktext data Date: Wed, 22 Mar 2023 14:18:48 +0000 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9882CC0021 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: jzoqqbix1euz9asdss1k7fe16f187frw X-HE-Tag: 1679494744-611253 X-HE-Meta: U2FsdGVkX18uu+ODnfvJTgQohTPrvMHbXFjKqVIAJ1c6uWoiWoYBfqxL3FSbSiX8xTgMjpbZ7qr6ZFq0vWpohxerl7+aAvmwFdW80cCdb+ZycanociZJDr4mJ1WbcNiDtF7/DT8hD/fGzjtS5a8xpgx0hQYosfrvASdU/bWnxZvSOBYfUF1caeYdzKnhJ/OuIZg3R7hw7ckg7ej/SBbsleoWED4/eT7bAMlbGmSSD0sMfwu9VxS8DGEwgWDTZ2GGrOu8FREt/oDNvxaynC7w6bwV2PyTw4TvcMzKsbUcCPWMSDKjKmxsPg7Hw2t9k02QO0QeiRVlNqjK1ZVc36t9Hz5nY8OhLWIQhXm8eG6jFh4mWWiGwx0TG3Wb72WG/YA1Jqa8+7SOH1Lzjv0cDLVaFxCpnW/HJPzx10CaWQhEkp5k+Vg0Qlhnax+OKDGAMuWeLN5hYqWyrlL3d54uHB9r51jarYI9lim63Dv8Hhm040W1PR+umQKoQVuFot8Gt9ezS3T00ddaeTcgWvtA3UboHirzjOrYPDTxOBQ+4aVxfGAn7P4UNdiLnMlYBWBCza/uLxyJaGN0Zr34qHtzyxiqWcmQm6So0fYUJ7BeVVzjpRhdzw0wlGgO6OLhU1OhVOz8Vs/176BGUTahRcdGuCO2EYY9vB5M0ib142pNpxWNJjCLsXMgtDxImg4P5EqzB3khVe8euvhaTBz0FnUUO7CHqsJ9UBnq7VfUaala9gBj0uDfRqAoeF2Ktg5mejafziFqPxUjFsEJvYAPCAyh2X3L8H6pC0qfFNE+xBSEB9+VumXTfVdLaf5gYVLyyWmVm4CdKd5UQ1mrqI0x2F96SI/8gaNpnqMPsqxQhXypCsKktWax8ZaNhBv75A0n1zJ0YBjqmuVZ1l6cIcToaMgV9Lu6JFQa0HaNKYPayEyzFTrlH9WZJMW8GacOyNtDQXJgH7roH9yFZa4dxF30oP9Gm42 VOEYJaZZ 2yT+O4GdE9vuavkfZJCnH5ULyrLW8Q4vI6/gOrIrZn0S0/LjaDpLN5KF6u8zOIKUTSpmA7b+OPJNDWuQQCDDkfYvt+zSwhrE+ihO3iOjx+CPrhlazCZgW6q1EvCNVPNbJy1jtDq02sDhq2rQg0llDloSESVP7At4gsYxGxWEILAeM4pJyHBKS33skxd5CVst9VGYYTbs6eNH4ZeIGTcvsT/7LUMhT+sNki0K+yDhxRFYddeFiQiOYUhf+MZ4l7FwxAX6s1Ug5WLKvloz92JQgkgrrqygM3JS31WiWrYnw5ArBiXJHneKN2ffSldwQBS8OKN+AkPYiNaRpE2bNIAk00I0qZ2ltps5y0BpPesdHPCneNmb4bgEgL+cp0ht1IK8pMZj2QMDAVeKXP4yV2t9nWUcdfcYRYIk7JwYoxcsojMWyqGita0rtoKzpE/P318e0E9zqNXOeJIrr3WXKbsDJvWgHkNMr3o/I2DZP3lFclTX+BINYCVrWdu01TepiFXHuZX003HRlDz0YBIkifSx9rJDy6v0mid3TdpZ5FJ2Y8F016VffP1Nlu68J1ec9zHhKxojN 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: Commit df04abfd181a ("fs/proc/kcore.c: Add bounce buffer for ktext data") introduced the use of a bounce buffer to retrieve kernel text data for /proc/kcore in order to avoid failures arising from hardened user copies enabled by CONFIG_HARDENED_USERCOPY in check_kernel_text_object(). We can avoid doing this if instead of copy_to_user() we use _copy_to_user() which bypasses the hardening check. This is more efficient than using a bounce buffer and simplifies the code. We do so as part an overall effort to eliminate bounce buffer usage in the function with an eye to converting it an iterator read. Signed-off-by: Lorenzo Stoakes Reviewed-by: David Hildenbrand --- fs/proc/kcore.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 71157ee35c1a..556f310d6aa4 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -541,19 +541,12 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) case KCORE_VMEMMAP: case KCORE_TEXT: /* - * Using bounce buffer to bypass the - * hardened user copy kernel text checks. + * We use _copy_to_user() to bypass usermode hardening + * which would otherwise prevent this operation. */ - if (copy_from_kernel_nofault(buf, (void *)start, tsz)) { - if (clear_user(buffer, tsz)) { - ret = -EFAULT; - goto out; - } - } else { - if (copy_to_user(buffer, buf, tsz)) { - ret = -EFAULT; - goto out; - } + if (_copy_to_user(buffer, (char *)start, tsz)) { + ret = -EFAULT; + goto out; } break; default: -- 2.39.2