From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793116988; b=rjm53PqwcwemjnswdoDnbzmp/vDRcJH70apvEGg9Ht4+/yi/YZJp43KmNoP0jMWc0oZM daXIiCQ5DTfJe7Sz9GNIMqR/66bMNu2wKhgwmlXGbNJ9jeBSeLfGJ5lnLXukblijZp91E 7ckXpuVZsmc3cVkRdK5tMdqUK1Yevzq179nVfSfcxcaI4t1ufJmG4FyYnz2c6h1ulclJx 0vbJeODjzpZyPzUA+HaAEwT8+ZxEiderqX2rfxYo9RMGrDcn7aEIC8msY8qwDc6DvnbK/ SebHRGVHNAfeG/mCrR9Cv6NoDASJNsYlOKY2fRdFOJXqv0U/bma2V5eRSW4skXPtaTw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793116988; h=DMARC-Filter:Received:Received:X-Authority-Analysis:DKIM-Signature: Received:From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:X-AntiAbuse: X-AntiAbuse:X-AntiAbuse:X-AntiAbuse:X-AntiAbuse:X-BWhitelist: X-Source-IP:X-Source-L:X-Exim-ID:X-Source:X-Source-Args:X-Source-Dir: X-Source-Sender:X-Source-Auth:X-Email-Count:X-Org:X-Source-Cap: X-Local-Domain:X-CMAE-Envelope; bh=l4PIwHarvU3x6l6mvAUeWbDvn4alE/qwD9vM0tpTFxU=; b=uv6I90Ej6ASN3ktpomxrTa4JtqBNP5YwvqZri1ymVhj9dv2gEFZYJcWCgW50Sm7bC8+0 nZna/O4S0QelbvrrZ407fg5zz7hK8zIGbRSNMGd2YBIGu/u68soKxgiqTPsb1Pb+oF1Gs 6vznXYG11a9IKYTUY7WzCBNcervesdEo1hPCyU8dhg2M3gbIoQAaBPuheOkejf2VXe5ZS 44xIb1bOkk+/PxS3mZqmVIj5Dp3LcGc4OsP9a3ajG6vxkEcZXo4Rq3ShUFR82wiR4BqFc lZT01YgF4NRx+o2hjfWmABzn+cEcQyAdhflv65gdi6C3vMfdMVB0XXEyyaEm2WzJd6w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=roeck-us.net; spf=fail smtp.mailfrom=roeck-us.net; dkim=pass header.d=roeck-us.net header.i=@roeck-us.net header.a=rsa-sha256 header.s=default header.b=NJ9nk6Ch; arc=none smtp.remote-ip=44.202.169.39 Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0776E606A31D for ; Tue, 27 Oct 2026 16:03:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0776E606A31D Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=roeck-us.net header.i=@roeck-us.net header.a=rsa-sha256 header.s=default header.b=NJ9nk6Ch Received: from eig-obgw-5002b.ext.cloudfilter.net ([10.0.29.226]) by cmsmtp with ESMTPS id Lgv0xzyImMylkLjdjxBtlF; Tue, 27 Oct 2026 16:03:07 +0000 Received: from 162-215-252-36.unifiedlayer.com ([208.91.199.152]) by cmsmtp with ESMTPS id Ljdixl9lTCWbvLjdixJPBI; Tue, 27 Oct 2026 16:03:06 +0000 X-Authority-Analysis: v=2.4 cv=bNEWIO+Z c=1 sm=1 tr=0 ts=6ae0cb3a a=QNED+QcLUkoL9qulTODnwA==:117 a=2cfIYNtKkjgZNaOwnGXpGw==:17 a=660iZSQnnn4A:10 a=M0FbrtG7MMAA:10 a=VwQbUJbxAAAA:8 a=_jlGtV7tAAAA:8 a=5xi0HWLX7wOsXyuw-usA:9 a=nlm17XC03S6CtCLSeiRr:22 a=KPbNTLLc3YvdawN95zVk:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Unsubscribe-Post:List-Subscribe:List-Post:List-Owner: List-Archive; bh=l4PIwHarvU3x6l6mvAUeWbDvn4alE/qwD9vM0tpTFxU=; b=NJ9nk6ChMiB9 3TQXePB2LW75GeG+G9gA9uS3CF3HljCDJDrg1nc0XIHuqfCtGABsMtJkd2sMYwoa/WKNncZ1h9r6d nuP1D4ST38PlrJrY3HTe7+KQ4UVE2Zq/fymMp7BhMn9py6P0Om+5Zz4MHK01iorytqomc3IPiwvQy 49p+XTL0JKqaMnKZDYGFpoURehHRSgqB55QfwHq0l55PYh83+/z/dOQ7D+/g9VOhjTkXdzhcnlx0m 3xHln8b1NO3AbSn5Nhrg2c4YsE6vZAI0aw5+dYPFBYiNExySTRdKAu57Dhcm8zY0CUYcq+W//1gaE Vm6kjx4zXdpIgMcU47hj8A==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:47896 helo=server.roeck-us.net) by bh-25.webhostbox.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.100.1) (envelope-from ) id 1xLjdh-00000000cFA-43pG; Tue, 27 Oct 2026 21:33:06 +0530 From: Guenter Roeck To: linux-watchdog@vger.kernel.org Cc: Tzung-Bi Shih , Guenter Roeck Subject: [PATCH v2 1/8] watchdog: core: Clear wd_data pointer on errors Date: Tue, 27 Oct 2026 09:02:55 -0700 Message-ID: <20261027160302.2519282-2-linux@roeck-us.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20261027160302.2519282-1-linux@roeck-us.net> References: <20261027160302.2519282-1-linux@roeck-us.net> X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-BWhitelist: no X-Source-IP: 108.223.40.66 X-Source-L: No X-Exim-ID: 1xLjdh-00000000cFA-43pG X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 108-223-40-66.lightspeed.sntcca.sbcglobal.net (server.roeck-us.net) [108.223.40.66]:47896 X-Source-Auth: guenter@roeck-us.net X-Email-Count: 4 X-Org: HG=direseller_whb_net_legacy;ORG=directi; X-Source-Cap: cm9lY2s7YWN0aXZzdG07YmgtMjUud2ViaG9zdGJveC5uZXQ= X-Local-Domain: yes X-CMAE-Envelope: MS4xfFrsG7X0S405Ci+n6dK3n3RZMZ88EKGwyDwEG8eoprQoFXMHKNdtLk4QgGVclDg9u14Joc3SBxb40B+cLm2eUJRXuiEwNgw/pCPeCn8WuaOSzd5i3Nll 5tbsqBk4cvkgPySJ2A8xZF4szmfOYzSq6XYzTXQSogNtcls17IRZRBYrypNXvmPKGoYBlYWauzux60CLiKXUg4wyaLO3EhPZtYImw2P6LczWXdnpCA4HH9UX In watchdog_cdev_register(), if device registration fails after the core watchdog_core_data structure is allocated and assigned to the persistent watchdog_device structure, the function frees the data but leaves a dangling pointer. During device registration, watchdog_cdev_register() links the newly allocated wd_data to wdd->wd_data. If a subsequent initialization step fails, such as the watchdog_kworker validation, dev_set_name(), misc_register(), or cdev_device_add(), the function cleans up by freeing wd_data via kfree() or put_device(). However, it fails to clear the wdd->wd_data pointer before returning. Furthermore, if cdev_device_add() fails after misc_register() exposed /dev/watchdog to userspace, a concurrent open may hold a reference to wd_data while the caller frees wdd, leaving wd_data->wdd dangling. Fix the problem by clearing wdd->wd_data on all error paths during watchdog registration, and clearing wd_data->wdd under wd_data->lock if cdev_device_add() fails. Fixes: b4ffb1909843 ("watchdog: Separate and maintain variables based on variable lifetime") Assisted-by: LLM Reviewed-by: Tzung-Bi Shih Signed-off-by: Guenter Roeck --- v2: Added Reviewed-by: tag drivers/watchdog/watchdog_dev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index e8c1fcb53c56..ed5b35184271 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -1033,6 +1033,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) wdd->wd_data = wd_data; if (IS_ERR_OR_NULL(watchdog_kworker)) { + wdd->wd_data = NULL; kfree(wd_data); return -ENODEV; } @@ -1046,6 +1047,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) dev_set_drvdata(&wd_data->dev, wdd); err = dev_set_name(&wd_data->dev, "watchdog%d", wdd->id); if (err) { + wdd->wd_data = NULL; put_device(&wd_data->dev); return err; } @@ -1066,6 +1068,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) pr_err("%s: a legacy watchdog module is probably present.\n", wdd->info->identity); old_wd_data = NULL; + wdd->wd_data = NULL; put_device(&wd_data->dev); return err; } @@ -1084,6 +1087,10 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) misc_deregister(&watchdog_miscdev); old_wd_data = NULL; } + mutex_lock(&wd_data->lock); + wd_data->wdd = NULL; + wdd->wd_data = NULL; + mutex_unlock(&wd_data->lock); put_device(&wd_data->dev); return err; } -- 2.45.2