From patchwork Fri Dec 2 03:02:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 28674 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp619003wrr; Thu, 1 Dec 2022 19:16:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf4XpsO8PlTO6/UsYakEVeMixKbzHabb+GMraMZ/+kBDrYXhrJitUxYp6lTjZgoPI5NTe+7k X-Received: by 2002:a63:f211:0:b0:477:def7:58a3 with SMTP id v17-20020a63f211000000b00477def758a3mr30252381pgh.423.1669950986908; Thu, 01 Dec 2022 19:16:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669950986; cv=none; d=google.com; s=arc-20160816; b=kmWSo+NhctdnTEEU2yVazptzdUFAbuX32Yi3Nd3dlRRFo5URVlKBab6n/5jZNxaaie vo43apqvMm4bp59bwdDukAfSOshPFJHq8jLh+EfVzrUvGBS6J9suMCFyifNQW/2BUea7 6fKvHo8T9mRKgsQ7OlPmedQxPzN09YB0Lg5fHXSqxB2x2HoF3+KYbVyWf3eVuzqwEnxQ bBkncKZJTguTecJZvu7ZKpWZsnPZEhp2aZDvxEla859F9etqHxrTFksudrghOTaUG7fg 4zbp5iW015XEYsini7InF4fKY7oKJQ0PowR5W5DFB6y0vBpJzAQYeIqCpZDJu3tlFpv9 xJ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=vwLa2nKqIT0sV4SIU0Y7d+22TLj4JxmRWBYowbUSkas=; b=A5tP4GS9M9AZrVET4bCvYUX5sv5KkNetv3r1d2G49WwRx96YD9RW/TSjyMa+isYbmn S0MQgtiWnqfaauVU1Byl8U55L2cyhxh7vDaI8TK5F4KBSl4wi85ifBVDic/vrFCSRjzC zYMUBN9AXpcJqO1bXerNYXhxYoEGf321kX/Xr1v1m1dLPJnXL4p85l1Phw2+DMQJ88hP sTTyAAzoQpelP399PtycXgELThSi1DFqVvqgP1xyuaRJMpxvqRDwGoEIMbLa1XUj+jPc 1CYqtejZ8UecjPW2mLBa0U27+QTcBVF8mJHs1cY2xuHGyVRQd+YiYs9RqVdU92pRQYsB EmXA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 17-20020a170902c11100b001871c762263si5675689pli.185.2022.12.01.19.16.13; Thu, 01 Dec 2022 19:16:26 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231701AbiLBDEu (ORCPT + 99 others); Thu, 1 Dec 2022 22:04:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbiLBDEt (ORCPT ); Thu, 1 Dec 2022 22:04:49 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3FFFD7572; Thu, 1 Dec 2022 19:04:47 -0800 (PST) Received: from dggpemm500007.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NNd3s2W5mzqSYQ; Fri, 2 Dec 2022 11:00:41 +0800 (CST) Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 2 Dec 2022 11:04:45 +0800 From: Yang Yingliang To: , CC: , , , , , Subject: [PATCH resend] chardev: fix error handling in cdev_device_add() Date: Fri, 2 Dec 2022 11:02:37 +0800 Message-ID: <20221202030237.520280-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747659893560608131?= X-GMAIL-MSGID: =?utf-8?q?1751070526375113523?= While doing fault injection test, I got the following report: ------------[ cut here ]------------ kobject: '(null)' (0000000039956980): is not initialized, yet kobject_put() is being called. WARNING: CPU: 3 PID: 6306 at kobject_put+0x23d/0x4e0 CPU: 3 PID: 6306 Comm: 283 Tainted: G W 6.1.0-rc2-00005-g307c1086d7c9 #1253 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:kobject_put+0x23d/0x4e0 Call Trace: cdev_device_add+0x15e/0x1b0 __iio_device_register+0x13b4/0x1af0 [industrialio] __devm_iio_device_register+0x22/0x90 [industrialio] max517_probe+0x3d8/0x6b4 [max517] i2c_device_probe+0xa81/0xc00 When device_add() is injected fault and returns error, if dev->devt is not set, cdev_add() is not called, cdev_del() is not needed. Fix this by checking dev->devt in error path. Fixes: 233ed09d7fda ("chardev: add helper function to register char devs with a struct device") Signed-off-by: Yang Yingliang --- The previous patch link: https://lore.kernel.org/lkml/20221025113957.693723-1-yangyingliang@huawei.com/ --- fs/char_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/char_dev.c b/fs/char_dev.c index ba0ded7842a7..3f667292608c 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -547,7 +547,7 @@ int cdev_device_add(struct cdev *cdev, struct device *dev) } rc = device_add(dev); - if (rc) + if (rc && dev->devt) cdev_del(cdev); return rc;