Fix CVE-2018-5750 (rhbz 1539706 1539708)

This commit is contained in:
Justin M. Forbes 2018-01-29 08:50:45 -06:00
parent 1b900de110
commit 232f01096a
2 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,41 @@
From patchwork Fri Jan 19 09:06:03 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: ACPI: sbshc: remove raw pointer from printk message
From: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
X-Patchwork-Id: 10174835
Message-Id: <20180119090603.GA7775@kroah.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
Wang Qize <wang_qize@venustech.com.cn>
Date: Fri, 19 Jan 2018 10:06:03 +0100
There's no need to be printing a raw kernel pointer to the kernel log at
every boot. So just remove it, and change the whole message to use the
correct dev_info() call at the same time.
Reported-by: Wang Qize <wang_qize@venustech.com.cn>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index 2fa8304171e0..217e1caf58d6 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -275,8 +275,8 @@ static int acpi_smbus_hc_add(struct acpi_device *device)
device->driver_data = hc;
acpi_ec_add_query_handler(hc->ec, hc->query_bit, NULL, smbus_alarm, hc);
- printk(KERN_INFO PREFIX "SBS HC: EC = 0x%p, offset = 0x%0x, query_bit = 0x%0x\n",
- hc->ec, hc->offset, hc->query_bit);
+ dev_info(&device->dev, "SBS HC: offset = 0x%0x, query_bit = 0x%0x\n",
+ hc->offset, hc->query_bit);
return 0;
}

View File

@ -669,6 +669,9 @@ Patch634: dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch
# rhbz 1539238
Patch635: Add-support-for-One-by-Wacom-CTL-472-CTL-672.patch
# CVE-2018-5750 rhbz 1539706 1539708
Patch636: ACPI-sbshc-remove-raw-pointer-from-printk-message.patch
# END OF PATCH DEFINITIONS
%endif
@ -2246,6 +2249,9 @@ fi
#
#
%changelog
* Mon Jan 29 2018 Justin M. Forbes <jforbes@fedoraproject.org>
- Fix CVE-2018-5750 (rhbz 1539706 1539708)
* Sat Jan 27 2018 Laura Abbott <labbott@fedoraproject.org>
- Add support for Wacom tablet (rhbz 1539238)