Message ID | 20180529144521.18114-2-apw@canonical.com |
---|---|
State | New |
Headers | show |
Series | [artful/linux,trusty/linux,1/1] ACPI: sbshc: remove raw pointer from printk() message | expand |
On 29/05/18 15:45, Andy Whitcroft wrote: > From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > 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: All applicable <stable@vger.kernel.org> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > (cherry picked from commit 43cdd1b716b26f6af16da4e145b6578f98798bf6) > CVE-2018-5750 > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > drivers/acpi/sbshc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c > index 2fa8304171e0..7a3431018e0a 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; > } > Clean cherry-pick, straight forward fix. Acked-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index 2fa8304171e0..7a3431018e0a 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; }