]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
usb: dwc3: Don't use %pK through printk
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>
Mon, 10 Mar 2025 15:38:24 +0000 (16:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Mar 2025 08:17:30 +0000 (09:17 +0100)
This is a revert of
commit 04fb365c453e ("usb: dwc3: replace %p with %pK")

When the formatting was changed from %p to %pK that was a security
improvement, as %p would leak raw pointer values to the kernel log.
Since commit ad67b74d2469 ("printk: hash addresses printed with %p")
the regular %p has been improved to avoid this issue.
On the other hand, restricted pointers ("%pK") were never meant to be used
through printk(). They can unintentionally still leak raw pointers or
acquire sleeping looks in atomic contexts.

Switch back to regular %p again.

Link: https://lore.kernel.org/lkml/20250113171731-dc10e3c1-da64-4af0-b767-7c7070468023@linutronix.de/
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Link: https://lore.kernel.org/r/20250310-restricted-pointers-usb-v2-2-a7598e2d47d1@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/dwc3-st.c
drivers/usb/dwc3/gadget.c

index ef7c43008946e15b72d88aba4941dc52bf0788d7..5d513decaacd22de15825dc061c2747cf09fef07 100644 (file)
@@ -225,7 +225,7 @@ static int st_dwc3_probe(struct platform_device *pdev)
 
        dwc3_data->syscfg_reg_off = res->start;
 
-       dev_vdbg(dev, "glue-logic addr 0x%pK, syscfg-reg offset 0x%x\n",
+       dev_vdbg(dev, "glue-logic addr 0x%p, syscfg-reg offset 0x%x\n",
                 dwc3_data->glue_base, dwc3_data->syscfg_reg_off);
 
        struct device_node *child __free(device_node) = of_get_compatible_child(node,
index a2f45b21c6d76387142f0d2a0c95921a82e3e3bc..47e73c4ed62d3ec52f0e8f5c3d5ef1aae4065771 100644 (file)
@@ -1979,12 +1979,12 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
                return -ESHUTDOWN;
        }
 
-       if (WARN(req->dep != dep, "request %pK belongs to '%s'\n",
+       if (WARN(req->dep != dep, "request %p belongs to '%s'\n",
                                &req->request, req->dep->name))
                return -EINVAL;
 
        if (WARN(req->status < DWC3_REQUEST_STATUS_COMPLETED,
-                               "%s: request %pK already in flight\n",
+                               "%s: request %p already in flight\n",
                                dep->name, &req->request))
                return -EINVAL;
 
@@ -2173,7 +2173,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
                }
        }
 
-       dev_err(dwc->dev, "request %pK was not queued to %s\n",
+       dev_err(dwc->dev, "request %p was not queued to %s\n",
                request, ep->name);
        ret = -EINVAL;
 out: