Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2409451pxb; Tue, 12 Oct 2021 06:07:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9QOIaFb9Z4GGq0L7HuQD67pk1LxFM/MmKN07V6irTJi+AXqelJVBDMN6sawElk/IE+6Fc X-Received: by 2002:a2e:b553:: with SMTP id a19mr5203835ljn.235.1634044058775; Tue, 12 Oct 2021 06:07:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634044058; cv=none; d=google.com; s=arc-20160816; b=1HUjUbiYS8Ppc8NJyQqh6FPN3spDmY9dOt1S+nDP8yUXDJ8b/GoIDFbLfI5H+Ir7Nq t1RBGL2OT+EBlJxfJBiUdBlCu4gQpe9JP/k46OTTVGPDf8RR+Y/F4fibXtTUzeqGYK9V oHz5sexzkj50jztE65f+DU7I9EK8JDhV0zr2GCCpYZdYmY9KJS12KVHLyRTCg0sEmTrf Y9NwC8k+JJRjn19gg9xSRAZbfm0x5vfJRqsoVfUjLc7YVAC7Rw/ukgI1X9F6GLTwoU60 2YAlWGEz2pxA0yZi91g4XeuxVkAXkoYsMRH0D4gcpYVRpofhBTSFcOCg+MpktmTMXJc1 m5Qw== 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=GLXolndnvKz1gkePmn01ypIjM5msZsiujWCPfq/kQhI=; b=XgJtKk1xyQfDplglzo1GfPhn5eAhmwQ8hgd/jGWcLkkSoyJNy/IxKSFBeufCy5Y/Uh mrLUeSNWYujwjggamf5BA6+j1WTpsMWY2uiv8A4lv2Q+x6nuYwvFweBtpHK7Yf6SB1hM 45d2WCNZruQfF1Vu6XU2ZKlAJxxFwe/yA6FoFkCR2Fwdi9vEmSsoGnzjpdA3uHqsYnWS MHucKQMY1SJdAQKqIFCwNyXhfg1K14GgJWRQ1ISeLIKI+y9YAlx1SbaM32hgWv938ohd IqE6mpSoVqpS92TTLLYZ8JJ94Fy/ygSsFgIReoJi0DUkoJcR3GpZFteRO+Mc9MDVW7+M KT/Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jg22si20773659ejc.776.2021.10.12.06.07.09; Tue, 12 Oct 2021 06:07:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236608AbhJLNDg (ORCPT + 99 others); Tue, 12 Oct 2021 09:03:36 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:13728 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232729AbhJLNDd (ORCPT ); Tue, 12 Oct 2021 09:03:33 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4HTG3F4r5mzWMyF; Tue, 12 Oct 2021 20:59:53 +0800 (CST) Received: from dggpeml500017.china.huawei.com (7.185.36.243) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Tue, 12 Oct 2021 21:01:30 +0800 Received: from huawei.com (10.175.103.91) by dggpeml500017.china.huawei.com (7.185.36.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Tue, 12 Oct 2021 21:01:29 +0800 From: Yang Yingliang To: , CC: Subject: [PATCH] chardev: fix error handling in cdev_device_add() Date: Tue, 12 Oct 2021 21:09:15 +0800 Message-ID: <20211012130915.3426584-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500017.china.huawei.com (7.185.36.243) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If dev->devt is not set, cdev_device_add() will not add the cdev, when device_add failed, cdev_del() is not needed, so delete cdev only when dev->devt is set. Reported-by: Hulk Robot Fixes: 233ed09d7fda ("chardev: add helper function to register...") Signed-off-by: Yang Yingliang --- 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; -- 2.25.1