Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
IronPort-SDR: NLMqOct6CYY+eYP6dLgWL9wqD9fEn/6kplIpDoIucWHsaC81VFTS6yLa9BYlMScwiS+5rKjpXt
 N03keQa7fB6yqvzHLjrBZL3o6UtY8jIKwwfFn/tkhH/3zlMrHyuUKIeajWHNdxXIE+Fj2OzIvN
 zC1Ralg8rVUxtEiNuQk75B8jWoefvaK/MdIMUE7NcL2Ed8xaD0sGnT4y+w+sXqJF4vq4TGr2va
 00MxHWtoz4PW487QsQROqXF5M68O0PsxpOpnMl/WSgFuNvW75/qZDZh9+Gakyz51ho4dW6D2Pa
 g34=
IronPort-PHdr: =?us-ascii?q?9a23=3ATfG4BxcGJoANw9KmNy9MT04vlGMj4u6mDksu8p?=
 =?us-ascii?q?Mizoh2WeGdxcS4Zh7h7PlgxGXEQZ/co6odzbaP6Oa9CCdZvM3JmUtBWaQEbw?=
 =?us-ascii?q?UCh8QSkl5oK+++Imq/EsTXaTcnFt9JTl5v8iLzG0FUHMHjew+a+SXqvnYdFR?=
 =?us-ascii?q?rlKAV6OPn+FJLMgMSrzeCy/IDYbxlViDanbr5+MRu7oR/Ru8QSjoduN6Y8xx?=
 =?us-ascii?q?XUqXZUZupawn9lK0iOlBjm/Mew+5Bj8yVUu/0/8sNLTLv3caclQ7FGFToqK2?=
 =?us-ascii?q?866tHluhnFVguP+2ATUn4KnRpSAgjK9w/1U5HsuSbnrOV92S2aPcrrTbAoXD?=
 =?us-ascii?q?mp8qlmRAP0hCoBKjU063/chNBug61HoRKhvx1/zJDSYIGJL/p1Y6fRccoHSW?=
 =?us-ascii?q?ZdQspdUipMAoa9b4sUFOoBPOBYr4bgrFUQtBW1GAesBOLxxT9Mm3D9wKk23u?=
 =?us-ascii?q?o9HQ3D2gEvGM4DvXrIoNnoLaseTf25x7TMwTneb/5a3DHw45XKfB88u/GBRb?=
 =?us-ascii?q?J+f9TMx0chFA3LiU6dpZD5Mz6PyugAqXSX4/ZmWOmyi2AnsQZxoj23y8gui4?=
 =?us-ascii?q?nIh4IVyk3D9S5kx4s0Jdy5SE5hbt6lDJdcqy+XOpBrQsw+WWFkojg1xaAbuZ?=
 =?us-ascii?q?OieiUB1ZcpxwbHZvCZb4SF5gjvWeWRLDtimn5pZb2yiwyv/UWkzuDwTtS43V?=
 =?us-ascii?q?dOoyZfjNXBuHAA2wbN5sWGUPdw/Eis1DCS3A7J8O5EO1o7la/DJp4kxb4/i4?=
 =?us-ascii?q?QcvFzYHi/zhEX2lKiWdlg4+uSw6+TofLHmppiEOo9xkA7+M6AultWnAeQ8Lw?=
 =?us-ascii?q?QCRmab9fm42bDn50H5T7JKjvo5kqndrp/WP9gUpqm8AwNN04Yj7QiwDyu+3d?=
 =?us-ascii?q?gGgXUKKEhJdRGHgoTzJV3CPf/1Ae2ij1molDpn3/XGMafgApXJIHjDirDhfb?=
 =?us-ascii?q?Nl5k9cyQszzcpQ55NIBr0dLv/+QVLxu8DCDhMjLQO73vvnBM1n1owCQWKPHr?=
 =?us-ascii?q?OZMKTKvF+M5+IvJfSMZYAMtDb+Nfcl/fjugmE9mVIGY6mp0oUYaGqiEvRlPU?=
 =?us-ascii?q?qZe3zsjckFEWsQuQo+VuPq2xWsSzlWMkezTaIh4XlvGZCmBIabHtuFnbebmi?=
 =?us-ascii?q?q3A8sFNSh9FlmQHCKwJM2/UPAWZXfXf5Js?=
From:   Yizhuo <yzhai003@ucr.edu>
Cc:     Yizhuo <yzhai003@ucr.edu>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] x86/hpet: Fix uninitialized use in hpet_msi_resume()
Date:   Tue,  8 Oct 2019 13:47:44 -0700
Message-Id: <20191008204745.12040-1-yzhai003@ucr.edu>
To:     unlisted-recipients:; (no To-header on input)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Inside function hpet_msi_resume(), variable "msg" could be
uninitialized if irq_chip_compose_msi_msg() returns -ENOSYS.
However, it is directly used in hpet_msi_write(),  which is
potentially unsafe.

Signed-off-by: Yizhuo <yzhai003@ucr.edu>
---
 arch/x86/kernel/hpet.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index c6f791bc481e..5bc76819dd32 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -501,6 +501,7 @@ static int hpet_clkevt_msi_resume(struct clock_event_device *evt)
 	struct irq_data *data = irq_get_irq_data(hc->irq);
 	struct msi_msg msg;
 
+	memset(&msg, 0, sizeof(struct msi_msg));
 	/* Restore the MSI msg and unmask the interrupt */
 	irq_chip_compose_msi_msg(data, &msg);
 	hpet_msi_write(hc, &msg);
-- 
2.17.1