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 83834C32774 for ; Tue, 23 Aug 2022 03:02:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E66C8D0003; Mon, 22 Aug 2022 23:02:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F3398D0008; Mon, 22 Aug 2022 23:02:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 514C48D0003; Mon, 22 Aug 2022 23:02:41 -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 28C698D0003 for ; Mon, 22 Aug 2022 23:02:41 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E330EC1377 for ; Tue, 23 Aug 2022 03:02:40 +0000 (UTC) X-FDA: 79829359680.22.AF3E73A Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf24.hostedemail.com (Postfix) with ESMTP id EFC0B18004F for ; Tue, 23 Aug 2022 03:02:39 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MBYnl5CwSzXdyw; Tue, 23 Aug 2022 10:58:19 +0800 (CST) Received: from huawei.com (10.175.124.27) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 23 Aug 2022 11:02:36 +0800 From: Miaohe Lin To: , , CC: , , , Subject: [PATCH v2 2/6] mm/hugetlb: fix WARN_ON(!kobj) in sysfs_create_group() Date: Tue, 23 Aug 2022 11:02:05 +0800 Message-ID: <20220823030209.57434-3-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220823030209.57434-1-linmiaohe@huawei.com> References: <20220823030209.57434-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661223760; a=rsa-sha256; cv=none; b=qLg3AWeK4liWHoMWY5s3WTXOF8IhEPfYjTzOXV1Eo8HKK+9p0njvDVnahXpoBMZWjaxFox 10x5CQy7I5tco+//zSZPHUkDJWt2udnAEFBthuNyEdJNxm/MIuGsynuLmxAKdR6pQozfRL rSqeMQ8JUtHVq0nRTc1Icoe2lBHQ/Eg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; spf=pass (imf24.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661223760; 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; bh=vDlx3jrWgZWh824jEUgO3qxGyaYWfa5Jsj80MVyFH/Q=; b=QaCSlnQAq/joqym+nMHu0YZDf3yV9Y/xWQVJgJ5OySRIk6O/FJG7Bu84kqcoCUZrkTatxb ySZyrKuT/ByQLEuQwBYEhhe/7NkCgGVfuYIRCVYnNcw+9gnrXeTLeFdGo+mUrFxQXNB2B7 /F4KMGAELChQ+wMa76sCiZRz7KQgg2E= X-Rspamd-Queue-Id: EFC0B18004F X-Rspam-User: Authentication-Results: imf24.hostedemail.com; dkim=none; spf=pass (imf24.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-Rspamd-Server: rspam01 X-Stat-Signature: z3nwdzrw3ohnguzmcfd5tg9e7e6gdm46 X-HE-Tag: 1661223759-715287 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: If sysfs_create_group() fails with hstate_attr_group, hstate_kobjs[hi] will be set to NULL. Then it will be passed to sysfs_create_group() if h->demote_order != 0 thus triggering WARN_ON(!kobj) check. Fix this by making sure hstate_kobjs[hi] != NULL when calling sysfs_create_group. Fixes: 79dfc695525f ("hugetlb: add demote hugetlb page sysfs interfaces") Signed-off-by: Miaohe Lin Reviewed-by: Mike Kravetz Reviewed-by: Muchun Song --- mm/hugetlb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 19a7a83af569..d46dfe5ba62c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3847,6 +3847,7 @@ static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent, if (retval) { kobject_put(hstate_kobjs[hi]); hstate_kobjs[hi] = NULL; + return retval; } if (h->demote_order) { -- 2.23.0