Merge "usb: gadget: Avoid exposing kernel addresses" (1abae70f) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/gadget/function/u_ctrl_hsic.c

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011, 2013-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011, 2013-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -574,7 +574,7 @@ static ssize_t gctrl_read_stats(struct file file, char __user ubuf,

		temp += scnprintf(buf + temp, DEBUG_BUF_SIZE - temp,
		"\nName: %s\n"
		"#PORT:%d port: %p\n"
		"#PORT:%d port: %pK\n"
		"to_usbhost: %lu\n"
		"to_modem: %lu\n"
		"cpkt_drp_cnt: %lu\n"

drivers/usb/gadget/function/u_data_hsic.c

+11 −11

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2014, Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2014,2016 Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -156,7 +156,7 @@ static int ghsic_data_alloc_requests(struct usb_ep ep, struct list_head head,
		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++) {
		@@ -272,7 +272,7 @@ static int ghsic_data_receive(void p, void data, size_t len)
		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);
		@@ -316,7 +316,7 @@ static void ghsic_data_write_tomdm(struct work_struct *w)
		}

		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;
		@@ -424,7 +424,7 @@ static void ghsic_data_start_rx(struct gdata_port *port)
		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;

		@@ -481,7 +481,7 @@ static void ghsic_data_start_io(struct gdata_port *port)
		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;
		@@ -543,7 +543,7 @@ static void ghsic_data_connect_w(struct work_struct *w)
		!test_bit(CH_READY, &port->bridge_sts))
		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) {
		@@ -855,14 +855,14 @@ int ghsic_data_connect(void *gptr, int port_num)

		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;
		}
		if (port->out) {
		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;
		@@ -939,7 +939,7 @@ static void dbg_timestamp(char event, struct sk_buff skb)
		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());
		@@ -1013,7 +1013,7 @@ static ssize_t ghsic_data_read_stats(struct file *file,
		spin_lock_irqsave(&port->rx_lock, flags);
		temp += scnprintf(buf + temp, DEBUG_DATA_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"