DivestOS/Patches/Linux_CVEs/CVE-2016-8403/ANY/0.patch
2017-10-29 22:14:37 -04:00

112 lines
3.1 KiB
Diff

diff --git a/drivers/usb/gadget/u_data_hsic.c b/drivers/usb/gadget/u_data_hsic.c
index ec13488..469a7a0 100644
--- a/drivers/usb/gadget/u_data_hsic.c
+++ b/drivers/usb/gadget/u_data_hsic.c
@@ -172,7 +172,7 @@
struct usb_request *req;
unsigned long flags;
- pr_debug("%s: ep:%s head:%p num:%d cb:%p", __func__,
+ pr_debug("%s: ep:%s head:%pK num:%d cb:%pK", __func__,
ep->name, head, num, cb);
for (i = 0; i < num; i++) {
@@ -289,7 +289,7 @@
return -ENOTCONN;
}
- pr_debug("%s: p:%p#%d skb_len:%d\n", __func__,
+ pr_debug("%s: p:%pK#%d skb_len:%d\n", __func__,
port, port->port_num, skb->len);
spin_lock_irqsave(&port->tx_lock, flags);
@@ -333,7 +333,7 @@
}
while ((skb = __skb_dequeue(&port->rx_skb_q))) {
- pr_debug("%s: port:%p tom:%lu pno:%d\n", __func__,
+ pr_debug("%s: port:%pK tom:%lu pno:%d\n", __func__,
port, port->to_modem, port->port_num);
info = (struct timestamp_info *)skb->cb;
@@ -441,7 +441,7 @@
struct timestamp_info *info;
unsigned int created;
- pr_debug("%s: port:%p\n", __func__, port);
+ pr_debug("%s: port:%pK\n", __func__, port);
if (!port)
return;
@@ -498,7 +498,7 @@
struct usb_ep *ep_out, *ep_in;
int ret;
- pr_debug("%s: port:%p\n", __func__, port);
+ pr_debug("%s: port:%pK\n", __func__, port);
if (!port)
return;
@@ -545,7 +545,7 @@
struct gdata_port *port =
container_of(w, struct gdata_port, connect_w);
int ret;
- printk("%s: connected=%d, CH_READY=%d, port=%p\n",
+ printk("%s: connected=%d, CH_READY=%d, port=%pK\n",
__func__, atomic_read(&port->connected),
test_bit(CH_READY, &port->bridge_sts), port);
if (!port || !atomic_read(&port->connected) ||
@@ -554,7 +554,7 @@
return;
}
- pr_debug("%s: port:%p\n", __func__, port);
+ pr_debug("%s: port:%pK\n", __func__, port);
ret = data_bridge_open(&port->brdg);
if (ret) {
@@ -746,7 +746,7 @@
platform_driver_register(pdrv);
- pr_debug("%s: port:%p portno:%d\n", __func__, port, port_num);
+ pr_debug("%s: port:%pK portno:%d\n", __func__, port, port_num);
return 0;
}
@@ -855,14 +855,14 @@
ret = usb_ep_enable(port->in);
if (ret) {
- pr_err("%s: usb_ep_enable failed eptype:IN ep:%p",
+ pr_err("%s: usb_ep_enable failed eptype:IN ep:%pK",
__func__, port->in);
goto fail;
}
ret = usb_ep_enable(port->out);
if (ret) {
- pr_err("%s: usb_ep_enable failed eptype:OUT ep:%p",
+ pr_err("%s: usb_ep_enable failed eptype:OUT ep:%pK",
__func__, port->out);
usb_ep_disable(port->in);
goto fail;
@@ -938,7 +938,7 @@
write_lock_irqsave(&dbg_data.lck, flags);
scnprintf(dbg_data.buf[dbg_data.idx], DBG_DATA_MSG,
- "%p %u[%s] %u %u %u %u %u %u\n",
+ "%pK %u[%s] %u %u %u %u %u %u\n",
skb, skb->len, event, info->created, info->rx_queued,
info->rx_done, info->rx_done_sent, info->tx_queued,
get_timestamp());
@@ -1012,7 +1012,7 @@
spin_lock_irqsave(&port->rx_lock, flags);
temp += scnprintf(buf + temp, DEBUG_BUF_SIZE - temp,
"\nName: %s\n"
- "#PORT:%d port#: %p\n"
+ "#PORT:%d port#: %pK\n"
"data_ch_open: %d\n"
"data_ch_ready: %d\n"
"\n******UL INFO*****\n\n"