usb: replace %p with %pK

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 0's.
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

CRs-fixed: 1052849
Change-Id: I0e98145730380ea983fa8f46a28d15dd6c2c31df
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>
Signed-off-by: Yasir Malik <ymalik@codeaurora.org>
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>

1 files changed, 19 insertions, 19 deletions

diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index d3527dd8b..38c8a11bb 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -230,13 +230,13 @@ static int usbatm_submit_urb(struct urb *urb)
 	struct usbatm_channel *channel = urb->context;
 	int ret;
 
-	/* vdbg("%s: submitting urb 0x%p, size %u",
+	/* vdbg("%s: submitting urb 0x%pK, size %u",
 	     __func__, urb, urb->transfer_buffer_length); */
 
 	ret = usb_submit_urb(urb, GFP_ATOMIC);
 	if (ret) {
 		if (printk_ratelimit())
-			atm_warn(channel->usbatm, "%s: urb 0x%p submission failed (%d)!\n",
+			atm_warn(channel->usbatm, "%s: urb 0x%pK submission failed (%d)!\n",
 				__func__, urb, ret);
 
 		/* consider all errors transient and return the buffer back to the queue */
@@ -261,7 +261,7 @@ static void usbatm_complete(struct urb *urb)
 	unsigned long flags;
 	int status = urb->status;
 
-	/* vdbg("%s: urb 0x%p, status %d, actual_length %d",
+	/* vdbg("%s: urb 0x%pK, status %d, actual_length %d",
 	     __func__, urb, status, urb->actual_length); */
 
 	/* usually in_interrupt(), but not always */
@@ -279,7 +279,7 @@ static void usbatm_complete(struct urb *urb)
 			return;
 
 		if (printk_ratelimit())
-			atm_warn(channel->usbatm, "%s: urb 0x%p failed (%d)!\n",
+			atm_warn(channel->usbatm, "%s: urb 0x%pK failed (%d)!\n",
 				__func__, urb, status);
 		/* throttle processing in case of an error */
 		mod_timer(&channel->delay, jiffies + msecs_to_jiffies(THROTTLE_MSECS));
@@ -340,7 +340,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
 	sarb = instance->cached_vcc->sarb;
 
 	if (sarb->tail + ATM_CELL_PAYLOAD > sarb->end) {
-		atm_rldbg(instance, "%s: buffer overrun (sarb->len %u, vcc: 0x%p)!\n",
+		atm_rldbg(instance, "%s: buffer overrun (sarb->len %u, vcc: 0x%pK)!\n",
 				__func__, sarb->len, vcc);
 		/* discard cells already received */
 		skb_trim(sarb, 0);
@@ -359,7 +359,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
 
 		/* guard against overflow */
 		if (length > ATM_MAX_AAL5_PDU) {
-			atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
+			atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%pK)!\n",
 				  __func__, length, vcc);
 			atomic_inc(&vcc->stats->rx_err);
 			goto out;
@@ -368,21 +368,21 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
 		pdu_length = usbatm_pdu_length(length);
 
 		if (sarb->len < pdu_length) {
-			atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
+			atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%pK)!\n",
 				  __func__, pdu_length, sarb->len, vcc);
 			atomic_inc(&vcc->stats->rx_err);
 			goto out;
 		}
 
 		if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
-			atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
+			atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%pK)!\n",
 				  __func__, vcc);
 			atomic_inc(&vcc->stats->rx_err);
 			goto out;
 		}
 
 		vdbg(&instance->usb_intf->dev,
-		     "%s: got packet (length: %u, pdu_length: %u, vcc: 0x%p)",
+		     "%s: got packet (length: %u, pdu_length: %u, vcc: 0x%pK)",
 		     __func__, length, pdu_length, vcc);
 
 		if (!(skb = dev_alloc_skb(length))) {
@@ -394,7 +394,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
 		}
 
 		vdbg(&instance->usb_intf->dev,
-		     "%s: allocated new sk_buff (skb: 0x%p, skb->truesize: %u)",
+		     "%s: allocated new sk_buff (skb: 0x%pK, skb->truesize: %u)",
 		     __func__, skb, skb->truesize);
 
 		if (!atm_charge(vcc, skb->truesize)) {
@@ -410,7 +410,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
 		__skb_put(skb, length);
 
 		vdbg(&instance->usb_intf->dev,
-		     "%s: sending skb 0x%p, skb->len %u, skb->truesize %u",
+		     "%s: sending skb 0x%pK, skb->len %u, skb->truesize %u",
 		     __func__, skb, skb->len, skb->truesize);
 
 		PACKETDEBUG(instance, skb->data, skb->len);
@@ -541,7 +541,7 @@ static void usbatm_rx_process(unsigned long data)
 
 	while ((urb = usbatm_pop_urb(&instance->rx_channel))) {
 		vdbg(&instance->usb_intf->dev,
-		     "%s: processing urb 0x%p", __func__, urb);
+		     "%s: processing urb 0x%pK", __func__, urb);
 
 		if (usb_pipeisoc(urb->pipe)) {
 			unsigned char *merge_start = NULL;
@@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned long data)
 						  buf_size - bytes_written);
 
 		vdbg(&instance->usb_intf->dev,
-		     "%s: wrote %u bytes from skb 0x%p to urb 0x%p",
+		     "%s: wrote %u bytes from skb 0x%pK to urb 0x%pK",
 		     __func__, bytes_written, skb, urb);
 
 		if (!UDSL_SKB(skb)->len) {
@@ -649,7 +649,7 @@ static void usbatm_cancel_send(struct usbatm_data *instance,
 	spin_lock_irq(&instance->sndqueue.lock);
 	skb_queue_walk_safe(&instance->sndqueue, skb, n) {
 		if (UDSL_SKB(skb)->atm.vcc == vcc) {
-			atm_dbg(instance, "%s: popping skb 0x%p\n", __func__, skb);
+			atm_dbg(instance, "%s: popping skb 0x%pK\n", __func__, skb);
 			__skb_unlink(skb, &instance->sndqueue);
 			usbatm_pop(vcc, skb);
 		}
@@ -658,7 +658,7 @@ static void usbatm_cancel_send(struct usbatm_data *instance,
 
 	tasklet_disable(&instance->tx_channel.tasklet);
 	if ((skb = instance->current_skb) && (UDSL_SKB(skb)->atm.vcc == vcc)) {
-		atm_dbg(instance, "%s: popping current skb (0x%p)\n", __func__, skb);
+		atm_dbg(instance, "%s: popping current skb (0x%pK)\n", __func__, skb);
 		instance->current_skb = NULL;
 		usbatm_pop(vcc, skb);
 	}
@@ -681,7 +681,7 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
 		goto fail;
 	}
 
-	vdbg(&instance->usb_intf->dev, "%s called (skb 0x%p, len %u)", __func__,
+	vdbg(&instance->usb_intf->dev, "%s called (skb 0x%pK, len %u)", __func__,
 	     skb, skb->len);
 
 	if (vcc->qos.aal != ATM_AAL5) {
@@ -873,7 +873,7 @@ static int usbatm_atm_open(struct atm_vcc *vcc)
 
 	mutex_unlock(&instance->serialize);
 
-	atm_dbg(instance, "%s: allocated vcc data 0x%p\n", __func__, new);
+	atm_dbg(instance, "%s: allocated vcc data 0x%pK\n", __func__, new);
 
 	return 0;
 
@@ -893,7 +893,7 @@ static void usbatm_atm_close(struct atm_vcc *vcc)
 
 	atm_dbg(instance, "%s entered\n", __func__);
 
-	atm_dbg(instance, "%s: deallocating vcc 0x%p with vpi %d vci %d\n",
+	atm_dbg(instance, "%s: deallocating vcc 0x%pK with vpi %d vci %d\n",
 		__func__, vcc_data, vcc_data->vpi, vcc_data->vci);
 
 	usbatm_cancel_send(instance, vcc);
@@ -1162,7 +1162,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
 		struct usbatm_channel *channel = i ?
 			&instance->tx_channel : &instance->rx_channel;
 
-		dev_dbg(dev, "%s: using %d byte buffer for %s channel 0x%p\n", __func__, channel->buf_size, i ? "tx" : "rx", channel);
+		dev_dbg(dev, "%s: using %d byte buffer for %s channel 0x%pK\n", __func__, channel->buf_size, i ? "tx" : "rx", channel);
 	}
 #endif