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 28CDDE674AA for ; Fri, 1 Nov 2024 07:12:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8299F6B0083; Fri, 1 Nov 2024 03:12:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D9386B0085; Fri, 1 Nov 2024 03:12:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69FEE6B0088; Fri, 1 Nov 2024 03:12:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4CF246B0083 for ; Fri, 1 Nov 2024 03:12:14 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E80FA81AF0 for ; Fri, 1 Nov 2024 07:12:13 +0000 (UTC) X-FDA: 82736655834.09.BA9697E Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf18.hostedemail.com (Postfix) with ESMTP id 03E381C000F for ; Fri, 1 Nov 2024 07:11:59 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=TMRI8Rsg; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of nathan@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=nathan@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730444969; a=rsa-sha256; cv=none; b=qr4AqYigwcQmwI5tLLl9lfV36I24/ZwOkUyghkl4NQZpvBPPwcnpwYLQeCdFdBRp14ENbv LcD8pWmG5GX50tPlXe54K5Q27Pg0XvRa/3qxwlcTmGXdubc3tMLIvxgAlVysTPdcTqDOuW kymiYT9lDXA7zvHpH8HF6DGPm/kha/Q= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=TMRI8Rsg; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of nathan@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=nathan@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730444969; 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=6HVePiYCa7IsDgsHSNYDL3TgHP3OBrbqbOGWFljtab8=; b=H5rnVhSaDU5wsqjxFB4Mbz6rwukgPg8LvQIWiG+1TF0Ybv655p9Gh8s1S9MpMEjkq3eX6t ia2vMu1wdssWqsR2OKTiNaAOfrtGN/tgBPrNNxlvXwtmsUGGje/IzzMckq2ahfMgxJ5Rob Xxiu1bF6BuM1pv7moW12qFtq8XZNt00= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 0400BA40B28; Fri, 1 Nov 2024 07:10:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E2D4C4CECD; Fri, 1 Nov 2024 07:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730445131; bh=a/tbdQUSfOoajn7Fe/W07LDP68zjdcZFeLkrzJjOTSM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TMRI8Rsg+7PnP3Yfh2jP13/tA5tkLnaNc4hAxMh2dJg3XlZ8HAag1BkAACTBvQ+0T Gc21GvomD8lpt0UgG/+NzfnFqZrNGAR2HhVamFTzZJ+or93fnqSfjP0TGE5iH6ROvm x9CnDTTVXgAc/lltzVyf77oom6FLrunoF6C3cffmUqXV3dFlXCFPvHN5rJbByNkquc eksrK7KoR46wxleJ9G6QAoOca1pwGbOBqm8LZbr8iQYel7SZtQtO+qBeQuWu30elOB VEmAytygiy2QX2nSB0V5BJzdsz+HcQJcKH7PiQMY892vzFlcCab/jyvEH6/KUVNCXP 4bxMR/0Y4PgJg== Date: Fri, 1 Nov 2024 00:12:08 -0700 From: Nathan Chancellor To: =?iso-8859-1?Q?Andr=E9?= Almeida Cc: Hugh Dickins , Andrew Morton , Alexander Viro , Christian Brauner , Jan Kara , krisman@kernel.org, Stephen Rothwell , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, kernel-dev@igalia.com, Theodore Ts'o Subject: Re: [PATCH 2/3] tmpfs: Fix type for sysfs' casefold attribute Message-ID: <20241101071208.GA2962282@thelio-3990X> References: <20241101013741.295792-1-andrealmeid@igalia.com> <20241101013741.295792-3-andrealmeid@igalia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20241101013741.295792-3-andrealmeid@igalia.com> X-Stat-Signature: o5tm5hzjs3cjekhm7anepksmser7g5wm X-Rspamd-Queue-Id: 03E381C000F X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1730445119-101693 X-HE-Meta: U2FsdGVkX18Rpl4Bn7E+C3WF7aIA8kKpcC8Ha7nBOSLSO74I2E1BJWeZ095ydqsaCMMx4GCEzn3OEnx6JCmke1xXVejKuvjvSCG1cVIGHjsfdznaWNL3eam45y58qbtGBdew5ptN5nhkozBl270spGuW5ED2rAi/ey0zXrCB3W6GnqTD9TclgvfFbygh+f3OoDiDSLcnvAaOZ/nU59rc+KZgfjdeywXVmiVyuEe6VgUEYV/ash4KVGU4wKTo/wSOSKUDJ0lsDxMVr2TC1ZmopWJUsL+0iDhwMrTNVHmr1d0jZlyHO5hic1lLl7zDLBeoMLZV18pzHQV+uQBv7hEoVQuSgRDqSGk/QiLGR2/vBdPB1ywjJz3tQPNdsJbsyIXvHySAKe1jv0CjiBzxRTffdRBOy62QnD4mrVn/5VDduo3EEtWpdBrvt2wIX9btHHXC20eM8zKkWcGleAV/rRLqoiPTpP7y6Ga9fueP1FTNR+HDe6Ief0WgfwsfYY25UvspPReYrjblN9YVjrLhcnrcemiqB2O+zfcTv+htZRVKt7XC4cw2msl+1fLg5DUqv1tIF2NrpmCJQ/KMeNUd0xdR2N8C0mh0/1nHKKgM0w5Ap1w4b570l7EJ9T9JLDfMi9YCZj1QGYhDMfWbuLWH2RzFf2XBqlyPjhR2y4RJzxqkiFTW0ti+fgGGs7sOj4j0Hgi184NMu7wGlJAG7EpCLYR0JNe5Fxtjo4iA/Tba4abWvqOJLXPAn+/fwLZZhXgFWGfPbgvwwrfQgArs1xFxPBdUzZL1Rrjhig1tGB8RNbIQpJdgcCZ0D+q0GTsVOeSvlaSMPQCQGzkYp38Eo+qggdksrTE3d/2h+iAlgj4FnS1pqgzyK8ohhwMdxdIwS8MG+pFCUdUGjly8kz5mMUmDZOls6bYy8AkKmm0sTXyWIzQHk5Fwz9d+fYeDGVUQVmJFCGjobRTA+hf8/PoxEap7wJN TWgmV68U Oyu7ghUzY+wkEkgsaEHoTEGd1bPK4fjsLgxhy5jNRG24OCJvQTCqZNFmbtjKCJF1323AHBEfHBvRSKE1ng/AMUaHbf7XeFWn5Y0Q4axLQEMAMgJGOwnt3sTUY/h9tA9M72IbopTQxjo/NejWttcdOvEAleilhQ1K3nq757+xtYPtp3HNWMiWVFgRSLclond0XEExjoSfmYZFMwJT0tvq/Uq/TIvt+rpvflhX7TzFyZtJ9mV1HKbU+Y1KjnJGebpa5bA3OT63vNJNbRVxq+Yh0AL7NnxQrNkBfjwp7Z0AEgDX/SajfjkP85D4/yoyw9EuwhrCWyvDnYspdlHvTovPsFfqc9l5LwsyTtqHVa30n4zgyMPfvJfS2fUqCFhWG1gLN2gRQBtF/TwcVnBSkIDWmkr3ZRw== 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, Oct 31, 2024 at 10:37:40PM -0300, André Almeida wrote: > DEVICE_STRING_ATTR_RO should be only used by device drivers since it > relies on `struct device` to use device_show_string() function. Using > this with non device code led to a kCFI violation: > > > cat /sys/fs/tmpfs/features/casefold > [ 70.558496] CFI failure at kobj_attr_show+0x2c/0x4c (target: device_show_string+0x0/0x38; expected type: 0xc527b809) > > Like the other filesystems, fix this by manually declaring the attribute > using kobj_attribute() and writing a proper show() function. > > Also, leave macros for anyone that need to expand tmpfs sysfs' with > more attributes (as seen in fs/btrfs/sysfs.c). > > Fixes: 5132f08bd332 ("tmpfs: Expose filesystem features via sysfs") > Reported-by: Nathan Chancellor > Closes: https://lore.kernel.org/lkml/20241031051822.GA2947788@thelio-3990X/ > Signed-off-by: André Almeida Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor > --- > mm/shmem.c | 29 +++++++++++++++++++++++++++-- > 1 file changed, 27 insertions(+), 2 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index b86f526a1cb1..6038e1d11987 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -5548,13 +5548,38 @@ struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, > EXPORT_SYMBOL_GPL(shmem_read_mapping_page_gfp); > > #if defined(CONFIG_SYSFS) && defined(CONFIG_TMPFS) > + > +#define __INIT_KOBJ_ATTR(_name, _mode, _show, _store) \ > +{ \ > + .attr = { .name = __stringify(_name), .mode = _mode }, \ > + .show = _show, \ > + .store = _store, \ > +} > + > +#define TMPFS_ATTR_W(_name, _store) \ > + static struct kobj_attribute tmpfs_attr_##_name = \ > + __INIT_KOBJ_ATTR(_name, 0200, NULL, _store) > + > +#define TMPFS_ATTR_RW(_name, _show, _store) \ > + static struct kobj_attribute tmpfs_attr_##_name = \ > + __INIT_KOBJ_ATTR(_name, 0644, _show, _store) > + > +#define TMPFS_ATTR_RO(_name, _show) \ > + static struct kobj_attribute tmpfs_attr_##_name = \ > + __INIT_KOBJ_ATTR(_name, 0444, _show, NULL) > + > #if IS_ENABLED(CONFIG_UNICODE) > -static DEVICE_STRING_ATTR_RO(casefold, 0444, "supported"); > +static ssize_t casefold_show(struct kobject *kobj, struct kobj_attribute *a, > + char *buf) > +{ > + return sysfs_emit(buf, "supported\n"); Small nit, I think this might be overindented? > +} > +TMPFS_ATTR_RO(casefold, casefold_show); > #endif > > static struct attribute *tmpfs_attributes[] = { > #if IS_ENABLED(CONFIG_UNICODE) > - &dev_attr_casefold.attr.attr, > + &tmpfs_attr_casefold.attr, > #endif > NULL > }; > -- > 2.47.0 >