Commit 057747d4 authored by Vamsi Krishna Samavedam's avatar Vamsi Krishna Samavedam Committed by Ben Hutchings

USB: core: replace %p with %pK

commit 2f964780 upstream.

Format specifier %p can leak kernel addresses while not valuing the
kptr_restrict system settings. When kptr_restrict is set to (1), kernel
pointers printed using the %pK format specifier will be replaced with
Zeros. Debugging Note : &pK prints only Zeros as address. If you need
actual address information, write 0 to kptr_restrict.

echo 0 > /proc/sys/kernel/kptr_restrict

[Found by poking around in a random vendor kernel tree, it would be nice
if someone would actually send these types of patches upstream - gkh]
Signed-off-by: default avatarVamsi Krishna Samavedam <vskrishn@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.2: drop changes in proc_reapurb*(), usbdev_do_ioctl(),
 usb_submit_urb()]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent ab8f1df1
...@@ -325,11 +325,11 @@ static void snoop_urb(struct usb_device *udev, ...@@ -325,11 +325,11 @@ static void snoop_urb(struct usb_device *udev,
if (userurb) { /* Async */ if (userurb) { /* Async */
if (when == SUBMIT) if (when == SUBMIT)
dev_info(&udev->dev, "userurb %p, ep%d %s-%s, " dev_info(&udev->dev, "userurb %pK, ep%d %s-%s, "
"length %u\n", "length %u\n",
userurb, ep, t, d, length); userurb, ep, t, d, length);
else else
dev_info(&udev->dev, "userurb %p, ep%d %s-%s, " dev_info(&udev->dev, "userurb %pK, ep%d %s-%s, "
"actual_length %u status %d\n", "actual_length %u status %d\n",
userurb, ep, t, d, length, userurb, ep, t, d, length,
timeout_or_status); timeout_or_status);
......
...@@ -1563,7 +1563,7 @@ int usb_hcd_unlink_urb (struct urb *urb, int status) ...@@ -1563,7 +1563,7 @@ int usb_hcd_unlink_urb (struct urb *urb, int status)
if (retval == 0) if (retval == 0)
retval = -EINPROGRESS; retval = -EINPROGRESS;
else if (retval != -EIDRM && retval != -EBUSY) else if (retval != -EIDRM && retval != -EBUSY)
dev_dbg(&udev->dev, "hcd_unlink_urb %p fail %d\n", dev_dbg(&udev->dev, "hcd_unlink_urb %pK fail %d\n",
urb, retval); urb, retval);
usb_put_dev(udev); usb_put_dev(udev);
} }
...@@ -1645,7 +1645,7 @@ void usb_hcd_flush_endpoint(struct usb_device *udev, ...@@ -1645,7 +1645,7 @@ void usb_hcd_flush_endpoint(struct usb_device *udev,
/* kick hcd */ /* kick hcd */
unlink1(hcd, urb, -ESHUTDOWN); unlink1(hcd, urb, -ESHUTDOWN);
dev_dbg (hcd->self.controller, dev_dbg (hcd->self.controller,
"shutdown urb %p ep%d%s%s\n", "shutdown urb %pK ep%d%s%s\n",
urb, usb_endpoint_num(&ep->desc), urb, usb_endpoint_num(&ep->desc),
is_in ? "in" : "out", is_in ? "in" : "out",
({ char *s; ({ char *s;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment