Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yangtao Li <frank.li@vivo.com>
To:     Gao Xiang <xiang@kernel.org>, Chao Yu <chao@kernel.org>,
        Yue Hu <huyue2@coolpad.com>,
        Jeffle Xu <jefflexu@linux.alibaba.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-erofs@lists.ozlabs.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] erofs: don't access kobject object members directly
Date:   Wed, 12 Apr 2023 11:11:10 +0800
Message-Id: <20230412031110.8965-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2ZAPPFD+1BB1pg1jNYMQIExoXw+qoAaq1hQS+SzNNPm6vDXecFymBTJXgmdo?=
 =?us-ascii?Q?8j0ePDAb2G2ifhkL+8qocpeYH4ecUobU/JYMz9MX8FZMNhKYHUjS/0t1NxoH?=
 =?us-ascii?Q?SYvRmLu3goOX6n3tVs9pI4yarvYVzo/T6E3Vb/1JgDtgDwMFWmrMpo97szKD?=
 =?us-ascii?Q?WrSsQJ22BM75MSen0JQpCYr1pjKkVRy+Ctzx1JjOrISoLj6bwhBrMGFKwd3u?=
 =?us-ascii?Q?lruXx5gOj1QP9IgyDSw+cx2WWeMMyUCYGyusv3FB+DTp+B/0X/FU2tzvd+UJ?=
 =?us-ascii?Q?I6P9Ju5/AZgvFaP7zbJ1nRUUnBFYjQ03IEemWTpQWJC8mP9K7o2MRxfJLnxT?=
 =?us-ascii?Q?sqLhhZke6VooJDeJXSMC913jxOpTL5njT3JLWo+EvM1A3a0RBDeZb4rf5xnW?=
 =?us-ascii?Q?uKMcnj/ugD9CrbBwvUNaTFITZhZXyXd9LxGQt8aw3sverf72/2ITDrhzOyK3?=
 =?us-ascii?Q?0jdkFoelpTeIenuyQmYlfDntD5ECiisLHg/MQGMJEVFwIb8yPT0Z5/KidRs/?=
 =?us-ascii?Q?YEMP+MtNnq3YIdKIHYmQcFOqSI5vExhnwbQg/PcSpWpfZ9HHI5pmfo+cb6de?=
 =?us-ascii?Q?e4wQI3MMRJdl20IypDBNU3PrqiA03rYRG0WfU3IyZDF3+IhM1cPoZc+d9JyJ?=
 =?us-ascii?Q?t2p+cZOlElaBbb5tt7HeIZ+W0lK4SADrTVm6ShKytEhSEneL69ycloluBoil?=
 =?us-ascii?Q?3/ImWplQxW2tx64CEbXKdKTihXy8B9gNgfdzU4L3/rJekAoWtcHE6ABsyQQ9?=
 =?us-ascii?Q?x470VJ4d+JMdvnxJvsMvJ6fLhhgvReZ1LeXfew6SeOFg/JuyJkXYfv1frFf0?=
 =?us-ascii?Q?l3GlKkth8aS0j5oVFSLU5mwtoCzwhcFa7ks8bbzUBIvLF8PYbvcNQOnRi/Ir?=
 =?us-ascii?Q?6DI39R4nMpXT4eJgrWxc9m/b0jMmPqjwA2/jrj3U8aeoj5kfduw4XdTZU2Cr?=
 =?us-ascii?Q?JSkaLJ+LqqEyQ3GP7L3ehmStuNvtx2Jgd6xDbtDk9oKOha2VbI9AXJH7j7Ij?=
 =?us-ascii?Q?TDjVituXv2jGmnyLB7oZO6FKJOrEG5t5v6Tof79JP3Fxjz8QduyioQdN5xmR?=
 =?us-ascii?Q?8hNDHiEEP7xxmtjFhNPIWNqk0pnyJWG2259Gxl+l9GUnZxU74uVMFjbC79vq?=
 =?us-ascii?Q?R22Gg/9J4z9CTOo9JcCpgHZ9uW9Kqhx2h4UfLwZ78nioTZua6j4FQX0z2Xkk?=
 =?us-ascii?Q?nWR3q4jCkQiHKESYW0vy0FJ0MXUc1Y428xUfjk/5bFINCu0YhW174bLSW2qP?=
 =?us-ascii?Q?ZWuOR08HMl/QxgIlv8by3Cq6Qw53cRsoy4VzqujsifPTNHuUgmOaibgZPF6g?=
 =?us-ascii?Q?l7zhGPO+MXKo9+0IsWZq6Z8VzuB9MRn6zPFyq7ujreSS/xkJW7hTu3IkrEnR?=
 =?us-ascii?Q?e59LXx9o0NikMWKqoNOxGkW5n6/iC02ywOTDacx2iOVVk4wtf/150rF8TOHT?=
 =?us-ascii?Q?mkWjWm4rHpRpw7wjf9aKywMO627skKU8vmOy3XW4y5CoXC3S0G3yyZEw94GV?=
 =?us-ascii?Q?NC9jaDwzD1MOcJdJRvTdT+LW2obh08z7j/1w2bLMNMrH1D2lJwyEsoEidZ38?=
 =?us-ascii?Q?VmLL4ckXoIyB06PLtWHBL4/9WylFpy2uJovovT9E?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1818bfa1-0230-4598-2a0d-08db3b03976a
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2023 03:11:21.6637
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: xDYqbIOGsFsPhtZY5tqOE7AVrX5F0LxSZFBlZgsrMkrsODFAvGX+8pIbkn3fgO+pedinxNUWeQ+de6IrurFSZg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5777
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It is better not to directly access the internal members of the
kobject object, especially kobject_init_and_add() may failure.
BTW remove unnecessary kobject_del(), kobject_put() actually covers
kobject removal automatically, which is single stage removal.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/erofs/internal.h | 1 +
 fs/erofs/sysfs.c    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index f675050af2bb..f364b1e9b35b 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -177,6 +177,7 @@ struct erofs_sb_info {
 	/* sysfs support */
 	struct kobject s_kobj;		/* /sys/fs/erofs/<devname> */
 	struct completion s_kobj_unregister;
+	bool sysfs_registered;
 
 	/* fscache support */
 	struct fscache_volume *volume;
diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c
index 435e515c0792..c38018d3c442 100644
--- a/fs/erofs/sysfs.c
+++ b/fs/erofs/sysfs.c
@@ -228,6 +228,7 @@ int erofs_register_sysfs(struct super_block *sb)
 	kfree(str);
 	if (err)
 		goto put_sb_kobj;
+	sbi->sysfs_registered = true;
 	return 0;
 
 put_sb_kobj:
@@ -240,8 +241,7 @@ void erofs_unregister_sysfs(struct super_block *sb)
 {
 	struct erofs_sb_info *sbi = EROFS_SB(sb);
 
-	if (sbi->s_kobj.state_in_sysfs) {
-		kobject_del(&sbi->s_kobj);
+	if (sbi->sysfs_registered) {
 		kobject_put(&sbi->s_kobj);
 		wait_for_completion(&sbi->s_kobj_unregister);
 	}
-- 
2.35.1