From nobody Tue Jun 16 18:27:14 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF67B184 for ; Thu, 30 Apr 2026 06:20:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777530036; cv=none; b=IcxlONsCbNohvmx7klJDHhlslQ/0G63kWJcRY6CHhwnSEW4itpPdtvh3jB0qQe4PuEcdBXpZNQsFQ1MlzxKLycmF+gMTkO006f86tcK1dGaI8ZarF2GucVQE3DjFPGxMr1Y1esCZdyuH9ujJgk2iCf7Yp5i7tRnJYkyeBiISu9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777530036; c=relaxed/simple; bh=gJLFtL6Fbls+54b+Ps+s9HUW8M9yA5/1qnTk+f6Kct8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=G05/S30aSA68l0CdkvGBzDZP0fMRDibp+Fj0d4qyjdBAaHUk7zW9O8WHNvoVRrJ+WxnuF7z+za1bkRZI2XXRl4PhMDbOaPF4kufgB4m/Pa8Cmya04wVZ9/gU9PC2llc70hWDEkYzCdVMFDBjlBbKoSfIFLNEWYANdf6hHGn43gk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=COW2EC1W; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="COW2EC1W" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2b2589c26e3so4350945ad.1 for ; Wed, 29 Apr 2026 23:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777530034; x=1778134834; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0v4HNXJdvhuAYgowkDqQRv5GlhnydYSAqKauS64hHAo=; b=COW2EC1WlxObpb1T4uz9cx18zGV1fjsgRwtHvHVJwtJ9r5s50ciXaM48EwP8to5jvH 9O1w2rdBWfV7pGFzQ+wLBm0XwyBX9qecAzyDzK8JRgy7CIqMhwXi9e6OVv5hNOtgwbNF FtGaUdNGxjwo8mv2VyFsEYNhItKXpz8EwzOyfMPNPwC+PlKjo/hYSS4FDOzNRGVTVych b7M4KITmgEEJPxAcKBFFheThRIEE9CZJfleFfl7hO0JYIHZnluGwM/kMyKr6N+gr6khE deYDHqqsD6AJRVxhZOZTSXKau4IIc7VylRBH8h2KHeQBcgEcO8L9vbh3zWtcvYrF/oDs 0WLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777530034; x=1778134834; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0v4HNXJdvhuAYgowkDqQRv5GlhnydYSAqKauS64hHAo=; b=ddZ1ONWGDUwxfFw5JuzQi34FOgvXL0MY1/QgNwjZzmhnbv8uqnecWGOlyT2/PWXNb5 lu7yg6d2t7XVmB+sipJieLcKzCIDHpL592JIImT4XwZRgRPQ4yaZ2V7XP5WjvDxlAs+U qxDhEeKqF2GoA7YQC3iQZaPgLRrhF6SerXfKFTJD5YqFebXRkzzPAgdOI4nLlGVvjQwi 4ARihX1gYiBmlSxjRrayHmEwja6AsPoP5E00ghUyM68oWgfQL1hIoOii0AJT1OT118K8 6GyJXAW/R9dh2rjIpuFJ+Ohdcejez2lRULIZ2bDM3bFZEDcyEScql81aewz+jqf3FxQU FhxQ== X-Forwarded-Encrypted: i=1; AFNElJ/azlsjLzgHEL4ZJtoSOvsjXjmom/tQw7a5ovf8uyHRkrLsPuN3HdKUkEX+rvl6Lcff1X/bY9K0bYUk6WY=@vger.kernel.org X-Gm-Message-State: AOJu0YyD0d6/oqNwF+d4JMTXUI8tkELjNW8cjtm6vbbWsZG14ekQk/sk gTBt7ajUbitvjP6Dh3TO7so3yDuFa1HG/GQJwNELE8KQYE1oUvBpcVx2 X-Gm-Gg: AeBDieubLVRZhmGEHyPWvLIko0WevSgBSp0+saGitUI+HPDntExboTouCSxf4y72zA4 6tlz4ZUTs19LMLjY+NG0pDLJPDVHAvbuHZI5ZSzj2gam/mUY99rpSJSpjIyi4MCvV1Ub5/SlDDJ dY4bQuMXZMIo0ysHO+N7nH51zdfOkhPmFI/E50bzdkkZsMadpLYZKiUx9GAWvx8Ou+8klrfJo1r WTs+6EZe5AwmCYPtBzPZTEqiS5kMT7mp1Yr53/xyWVwkAeu0UZmxZ6CRe1SlADP1DXAUq/7tBzK PJCQLtqtSM6VhxkkGliJeEZ9Gop/K2jUFiAmM9IpBFtKz+8d4PfwgP9yEl+ILoPLmz1nu394AaL YBWE+Z3zwT25tWHyLtrV130fh9Fs0J9sdpQdw3P+rRx7Xjb/jp/XQ2XtHKq1av03yosyJJSavK0 ni6+xhfUyYSxdryksV7vEiPNeXFcqwbqteZuc= X-Received: by 2002:a17:902:a60e:b0:2b4:5dad:2523 with SMTP id d9443c01a7336-2b9a253c353mr12976415ad.35.1777530033972; Wed, 29 Apr 2026 23:20:33 -0700 (PDT) Received: from lgs.. ([101.36.107.223]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b98895d591sm44466085ad.62.2026.04.29.23.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 23:20:33 -0700 (PDT) From: Guangshuo Li To: Alexander Shishkin , linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH] hwtracing: intel_th: Fix resource double free on device_add() failure Date: Thu, 30 Apr 2026 14:20:25 +0800 Message-ID: <20260430062025.448981-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" intel_th_device_add_resources() stores a kmemdup()'d resource array in thdev->resource. The array is released from the device release callback via intel_th_device_release() -> intel_th_device_free(). If device_add() fails in intel_th_subdevice_alloc(), the error path first frees thdev->resource manually and then calls put_device(). Since the device has been initialized and has a release callback, put_device() can drop the final reference and call intel_th_device_free(), which frees thdev->resource again. Fix the error path by letting the release callback handle thdev->resource and jumping directly to put_device() after device_add() failure. This issue was found by a static analysis tool I am developing. Fixes: a753bfcfdb1f ("intel_th: Make the switch allocate its subdevices") Signed-off-by: Guangshuo Li --- drivers/hwtracing/intel_th/core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th= /core.c index 3924e63e2eee..1d33c9e42c59 100644 --- a/drivers/hwtracing/intel_th/core.c +++ b/drivers/hwtracing/intel_th/core.c @@ -683,7 +683,7 @@ intel_th_subdevice_alloc(struct intel_th *th, =20 err =3D device_add(&thdev->dev); if (err) - goto fail_free_res; + goto fail_put_device; =20 /* need switch driver to be loaded to enumerate the rest */ if (subdev->type =3D=3D INTEL_TH_SWITCH && !req) { @@ -694,9 +694,6 @@ intel_th_subdevice_alloc(struct intel_th *th, =20 return thdev; =20 -fail_free_res: - kfree(thdev->resource); - fail_put_device: put_device(&thdev->dev); =20 --=20 2.43.0