From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70EC0198E60; Thu, 6 Jun 2024 14:08:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682936; cv=none; b=mFP3TmfVWKWYaRkbsI4RvH8dKpbCBM+SbRYvvs3c0tvFhFQpSidfb9yGpF8zLvd/nwjrDc+VollKA5iDdzdmqN3xPCdpKia0sOKCP/nvOonrnGIhOvhWTdn05WLarbbWqUuldgXooHHlKTx+H6wBw0JmOWF9iCGAVgVuwoAXxG0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682936; c=relaxed/simple; bh=++rEYy8DapI4lq3fZqJueQOQ5OAoNtDQ/bOPYEaGSY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b7mCZwBGtOAyoKCKHR2Eoh7jZs3zM/c7PQeyZHi/mfwD9HyKcLBskwCmd212cdiQZ8u+008/w0izobn/mPgZ4LZOTtktEXdfMLT6REAAGsPz6mMzkZls0+xVJLVCJePrA+m+qhfcsuqAdHhevXa+KFQ0SWkVcGl0EXtBkIz2wRk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=K1GZC/fI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="K1GZC/fI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CC1AC32781; Thu, 6 Jun 2024 14:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717682936; bh=++rEYy8DapI4lq3fZqJueQOQ5OAoNtDQ/bOPYEaGSY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K1GZC/fIJiduIIr4S+KyWMJJ4uiabwwH4CXJuN5RwoCmsltlCjN1eZU14LrOr0IYT UBvp2YOuu/Uf4a5xZy96xsMhPUxosMFrvPEQmS46sV+5k3YsR3a1SwXJcXyfZ2zwwu 2P0b5PDe16m/bZCcdrtXxD8L4tELn3CHrI4pB/ts= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Amelie Delaunay , Andy Shevchenko , Alexander Shishkin , Sasha Levin Subject: [PATCH 6.9 087/374] stm class: Fix a double free in stm_register_device() Date: Thu, 6 Jun 2024 16:01:06 +0200 Message-ID: <20240606131654.803170704@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131651.683718371@linuxfoundation.org> References: <20240606131651.683718371@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter [ Upstream commit 3df463865ba42b8f88a590326f4c9ea17a1ce459 ] The put_device(&stm->dev) call will trigger stm_device_release() which frees "stm" so the vfree(stm) on the next line is a double free. Fixes: 389b6699a2aa ("stm class: Fix stm device initialization order") Signed-off-by: Dan Carpenter Reviewed-by: Amelie Delaunay Reviewed-by: Andy Shevchenko Signed-off-by: Alexander Shishkin Link: https://lore.kernel.org/r/20240429130119.1518073-2-alexander.shishkin@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/hwtracing/stm/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 534fbefc7f6aa..20895d3915623 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -868,8 +868,11 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, return -ENOMEM; stm->major = register_chrdev(0, stm_data->name, &stm_fops); - if (stm->major < 0) - goto err_free; + if (stm->major < 0) { + err = stm->major; + vfree(stm); + return err; + } device_initialize(&stm->dev); stm->dev.devt = MKDEV(stm->major, 0); @@ -913,10 +916,8 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, err_device: unregister_chrdev(stm->major, stm_data->name); - /* matches device_initialize() above */ + /* calls stm_device_release() */ put_device(&stm->dev); -err_free: - vfree(stm); return err; } -- 2.43.0