watchdog: i6300esb: stop printing kernel addresses
diff mbox series

Message ID 20190318011915.32442-1-mcroce@redhat.com
State Accepted
Headers show
Series
  • watchdog: i6300esb: stop printing kernel addresses
Related show

Commit Message

Matteo Croce March 18, 2019, 1:19 a.m. UTC
Since commit ad67b74d2469d9b8 ("printk: hash addresses printed with %p"),
i6300esb prints "____ptrval____" instead of actual addresses:

    i6300ESB timer 0000:00:03.0: initialized (0x(____ptrval____)). heartbeat=30 sec (nowayout=1)

Instead of changing the print to "%px", and leaking kernel addresses,
just remove the print completely, cfr. e.g. commit 071929dbdd865f77
("arm64: Stop printing the virtual memory layout").

Signed-off-by: Matteo Croce <mcroce@redhat.com>
---
 drivers/watchdog/i6300esb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Guenter Roeck March 18, 2019, 2:53 a.m. UTC | #1
On 3/17/19 6:19 PM, Matteo Croce wrote:
> Since commit ad67b74d2469d9b8 ("printk: hash addresses printed with %p"),
> i6300esb prints "____ptrval____" instead of actual addresses:
> 
>      i6300ESB timer 0000:00:03.0: initialized (0x(____ptrval____)). heartbeat=30 sec (nowayout=1)
> 
> Instead of changing the print to "%px", and leaking kernel addresses,
> just remove the print completely, cfr. e.g. commit 071929dbdd865f77
> ("arm64: Stop printing the virtual memory layout").
> 
> Signed-off-by: Matteo Croce <mcroce@redhat.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/watchdog/i6300esb.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
> index 950c71a8bb22..e312a2aeecad 100644
> --- a/drivers/watchdog/i6300esb.c
> +++ b/drivers/watchdog/i6300esb.c
> @@ -328,8 +328,8 @@ static int esb_probe(struct pci_dev *pdev,
>   		goto err_unmap;
>   	}
>   	dev_info(&pdev->dev,
> -		"initialized (0x%p). heartbeat=%d sec (nowayout=%d)\n",
> -		edev->base, edev->wdd.timeout, nowayout);
> +		"initialized. heartbeat=%d sec (nowayout=%d)\n",
> +		edev->wdd.timeout, nowayout);
>   	return 0;
>   
>   err_unmap:
>
Matteo Croce March 18, 2019, 11:53 p.m. UTC | #2
On Mon, Mar 18, 2019 at 3:53 AM Guenter Roeck <linux@roeck-us.net> wrote:
>
> On 3/17/19 6:19 PM, Matteo Croce wrote:
> > Since commit ad67b74d2469d9b8 ("printk: hash addresses printed with %p"),
> > i6300esb prints "____ptrval____" instead of actual addresses:
> >
> >      i6300ESB timer 0000:00:03.0: initialized (0x(____ptrval____)). heartbeat=30 sec (nowayout=1)
> >
> > Instead of changing the print to "%px", and leaking kernel addresses,
> > just remove the print completely, cfr. e.g. commit 071929dbdd865f77
> > ("arm64: Stop printing the virtual memory layout").
> >
> > Signed-off-by: Matteo Croce <mcroce@redhat.com>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
> > ---
> >   drivers/watchdog/i6300esb.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
> > index 950c71a8bb22..e312a2aeecad 100644
> > --- a/drivers/watchdog/i6300esb.c
> > +++ b/drivers/watchdog/i6300esb.c
> > @@ -328,8 +328,8 @@ static int esb_probe(struct pci_dev *pdev,
> >               goto err_unmap;
> >       }
> >       dev_info(&pdev->dev,
> > -             "initialized (0x%p). heartbeat=%d sec (nowayout=%d)\n",
> > -             edev->base, edev->wdd.timeout, nowayout);
> > +             "initialized. heartbeat=%d sec (nowayout=%d)\n",
> > +             edev->wdd.timeout, nowayout);
> >       return 0;
> >
> >   err_unmap:
> >
>

Nit: can someone add the fixes tag before merge?

Fixes: ad67b74d2469d9b8 ("printk: hash addresses printed with %p")

Thanks,
Guenter Roeck March 19, 2019, 12:17 a.m. UTC | #3
On 3/18/19 4:53 PM, Matteo Croce wrote:
> On Mon, Mar 18, 2019 at 3:53 AM Guenter Roeck <linux@roeck-us.net> wrote:
>>
>> On 3/17/19 6:19 PM, Matteo Croce wrote:
>>> Since commit ad67b74d2469d9b8 ("printk: hash addresses printed with %p"),
>>> i6300esb prints "____ptrval____" instead of actual addresses:
>>>
>>>       i6300ESB timer 0000:00:03.0: initialized (0x(____ptrval____)). heartbeat=30 sec (nowayout=1)
>>>
>>> Instead of changing the print to "%px", and leaking kernel addresses,
>>> just remove the print completely, cfr. e.g. commit 071929dbdd865f77
>>> ("arm64: Stop printing the virtual memory layout").
>>>
>>> Signed-off-by: Matteo Croce <mcroce@redhat.com>
>>
>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>
>>> ---
>>>    drivers/watchdog/i6300esb.c | 4 ++--
>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
>>> index 950c71a8bb22..e312a2aeecad 100644
>>> --- a/drivers/watchdog/i6300esb.c
>>> +++ b/drivers/watchdog/i6300esb.c
>>> @@ -328,8 +328,8 @@ static int esb_probe(struct pci_dev *pdev,
>>>                goto err_unmap;
>>>        }
>>>        dev_info(&pdev->dev,
>>> -             "initialized (0x%p). heartbeat=%d sec (nowayout=%d)\n",
>>> -             edev->base, edev->wdd.timeout, nowayout);
>>> +             "initialized. heartbeat=%d sec (nowayout=%d)\n",
>>> +             edev->wdd.timeout, nowayout);
>>>        return 0;
>>>
>>>    err_unmap:
>>>
>>
> 
> Nit: can someone add the fixes tag before merge?
> 
> Fixes: ad67b74d2469d9b8 ("printk: hash addresses printed with %p")
> 

This isn't really a bug fix.

Guenter

Patch
diff mbox series

diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 950c71a8bb22..e312a2aeecad 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -328,8 +328,8 @@  static int esb_probe(struct pci_dev *pdev,
 		goto err_unmap;
 	}
 	dev_info(&pdev->dev,
-		"initialized (0x%p). heartbeat=%d sec (nowayout=%d)\n",
-		edev->base, edev->wdd.timeout, nowayout);
+		"initialized. heartbeat=%d sec (nowayout=%d)\n",
+		edev->wdd.timeout, nowayout);
 	return 0;
 
 err_unmap: