Skip to content

Security patches for ElementalX-CM #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NewEraCracker wants to merge 65 commits into from
Closed

Security patches for ElementalX-CM #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
65796c4
arm64: Log the machine name string during boot up
Jun 13, 2014
9c4e459
leds: qpnp-flash: check power supply variable in flash led driver
Feb 23, 2016
d491a19
diag: Use correct index while accessing DCI channel
Apr 19, 2016
24568c8
Replace %p with %pK to prevent leaking kernel address
mkayyash May 24, 2016
99460d6
soc: qcom: smp2p: Fix kernel address leak
Aug 16, 2016
97d73cf
misc: qcom: qdsp6v2: initialize wma_config_32
Aug 16, 2016
bda44b8
misc: qcom: qdsp6v2: initialize config_32
Aug 29, 2016
1b9abfe
qseecom: Fix stack out of bounds issue
Feb 10, 2016
937d64b
UPSTREAM: ppp: defer netns reference release for ppp channel
congwang Jul 6, 2016
be1bc84
ANDROID: binder: Clear binder and cookie when setting handle in flat …
arve-android Aug 12, 2016
193e770
UPSTREAM: arm64: make sys_call_table const
mrutland-arm Jan 8, 2015
73a8d4c
usb: gadget: f_mtp: simplify ptp NULL pointer check
pundiramit Aug 11, 2015
d6b63fa
ANDROID: video: adf: Avoid directly referencing user pointers
Sep 21, 2016
5858f05
diag: dci: avoid out of bounds memory access
nickdesaulniers Oct 6, 2016
da5522d
binder: blacklist %p kptr_restrict
nickdesaulniers Oct 7, 2016
43c7d6e
msm: camera: Avoid exposing kernel addresses
Oct 11, 2016
b34bc20
drivers: video: Add bounds checking in fb_cmap_to_user
spfetsch Oct 14, 2016
90d20dc
shmem: fix shm fallocate() list corruption
torvalds Dec 5, 2016
071ebb0
blk-mq: update hardware and software queues for sleeping alloc
axboe Oct 27, 2016
3a100ae
msm: msm_bus: limit max chars read by sscanf
Aug 5, 2016
fbd160a
msm: crypto: Fix integer over flow check in qcrypto driver
Aug 16, 2016
e0c87dc
qcedev: Validate Source and Destination addresses
Aug 31, 2016
2c7d6e8
msm: sensor: Avoid potential stack overflow
Sep 1, 2016
f2994e3
net: ipc_router: fix NULL pointer de-reference issue
Sep 21, 2016
7ff2c62
cgroup: prefer %pK to %p
nickdesaulniers Sep 12, 2016
44ae0ca
ext4: fix potential use after free in __ext4_journal_stop
Oct 18, 2015
6984213
netfilter: nfnetlink: correctly validate length of batch messages
Feb 2, 2016
5f5eb19
BACKPORT: usb: gadget: f_fs: Fix use-after-free
larsclausen Apr 14, 2016
f4a8668
tcp: fix use after free in tcp_xmit_retransmit_queue()
edumazet Aug 17, 2016
3061f9f
ASoC: msm: initialize the params array before using it
Sep 7, 2016
0aabc13
UPSTREAM: arm64: vdso: Mark vDSO code as read-only
d3zd3z Feb 10, 2016
035eecd
Don't show empty tag stats for unprivileged uids
mkayyash May 11, 2016
76c0767
input: synaptics: Add checks of user input data
jiayy Aug 10, 2016
5292853
input: synaptics_dsx: add checks of user input data
m-chong Sep 2, 2016
27064b9
ASoC: msm: Add Buffer overflow check
Sep 7, 2016
989fea7
jbd2: fix incorrect unlock on j_list_lock
tsgates Oct 13, 2016
a3b7104
diag: Fix possible kernel addresses leak
Apr 12, 2016
7c8b267
sched: Fix integer overflow in sched_update_nr_prod()
DefinitelyNOTobscenelyvague Sep 28, 2016
971ab1b
ASoC: qdsp6v2: fix potential bug of infinite loop
Oct 10, 2016
5be3c35
net: ping: Fix stack buffer overflow in ping_common_sendmsg()
Oct 13, 2016
8ed1ec0
qcom: scm: remove printing input arguments
Nov 2, 2016
f7ca83f
ASoC: soc: prevent risk of buffer overflow
Nov 4, 2016
9226a5e
msm: kgsl: Fix overflow in sharedmem cache range operation function
Nov 4, 2016
5e41f89
ASoC: msm: q6dspv2: fix potentional information leak
Nov 9, 2016
87a0382
drivers: video: Add bounds checking in fb_copy_cmap
spfetsch Oct 14, 2016
a228eef
soc: qcom: scm: add check to avoid buffer overflow (Edited)
Oct 25, 2016
74219da
qcacld-2.0: Dont include ext caps in Assoc request if AP doesn't support
Jan 11, 2016
0d131b9
qcacld-2.0: Validate CCXBEACONREQ IE fields
Jun 7, 2016
0628bcf
qcacld-2.0: Fix scan failure issue due to stale PE session
Jul 30, 2016
eac557f
qcacld-2.0: Discard pktlog message for invalid msdu id
govindsi Aug 10, 2016
68b0702
Revert "UPSTREAM: ppp: defer netns reference release for ppp channel"
NewEraCracker Dec 26, 2016
403175e
UPSTREAM: ppp: defer netns reference release for ppp channel
congwang Jul 6, 2016
8c3672f
msm: crypto: Fix integer over flow check in qce driver
Oct 24, 2016
39bf849
BACKPORT: Bluetooth: Fix potential NULL dereference in RFCOMM bind ca…
May 14, 2015
946a2c0
ANDROID: trace: net: use %pK for kernel pointers
gquiche Jul 12, 2016
45b21fa
perf: Fix event->ctx locking
Jan 23, 2015
44b8375
ASoC: msm: set pointers to NULL after kfree
Jul 27, 2016
4c91151
msm: sensor: Adding mutex for actuator power down operations
Oct 3, 2016
68cb53a
radio-iris: check argument values before copying the data
Oct 19, 2016
10b1252
ion: use %pK instead of %p which respects kptr_restrict sysctl
Sep 2, 2016
6d1c28b
ion: blacklist %p kptr_restrict
nickdesaulniers Oct 7, 2016
a68ce2e
msm: ipa: fix the potential heap overflow on wan-driver
Nov 30, 2016
7f3d345
usb: Avoid exposing kernel addresses
Dec 14, 2016
462ca54
msm: camera: cpp: Add validation for v4l2 ioctl arguments
Dec 21, 2016
7f0fe6c
input: synaptics: s1302: Make s1302_is_keypad_stopped() safe
kerneltoast Jan 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions arch/arm64/kernel/setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,10 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
}

machine_name = of_flat_dt_get_machine_name();
dump_stack_set_arch_desc("%s (DT)", machine_name);
if (machine_name)
if (machine_name) {
dump_stack_set_arch_desc("%s (DT)", machine_name);
pr_info("Machine: %s\n", machine_name);
}
}

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/kernel/sys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
* The sys_call_table array must be 4K aligned to be accessible from
* kernel/entry.S.
*/
void *sys_call_table[__NR_syscalls] __aligned(4096) = {
void * const sys_call_table[__NR_syscalls] __aligned(4096) = {
[0 ... __NR_syscalls - 1] = sys_ni_syscall,
#include <asm/unistd.h>
};
3 changes: 1 addition & 2 deletions arch/arm64/kernel/vdso/vdso.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
#include <linux/const.h>
#include <asm/page.h>

__PAGE_ALIGNED_DATA

.globl vdso_start, vdso_end
.section .rodata
.balign PAGE_SIZE
vdso_start:
.incbin "arch/arm64/kernel/vdso/vdso.so"
Expand Down
6 changes: 3 additions & 3 deletions block/blk-mq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,9 +1127,9 @@ static struct request *blk_mq_map_request(struct request_queue *q,
hctx = alloc_data.hctx;
}

hctx->queued++;
data->hctx = hctx;
data->ctx = ctx;
data->hctx = alloc_data.hctx;
data->ctx = alloc_data.ctx;
data->hctx->queued++;
return rq;
}

Expand Down
18 changes: 9 additions & 9 deletions drivers/char/diag/diag_dci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static void dci_chk_handshake(unsigned long data)
{
int index = (int)data;

if (index < 0 || index > NUM_DCI_PROC)
if (index < 0 || index >= NUM_DCI_PROC)
return;

queue_work(driver->diag_dci_wq,
Expand Down Expand Up @@ -411,7 +411,7 @@ static int diag_process_single_dci_pkt(unsigned char *buf, int len,
uint8_t cmd_code = 0;

if (!buf || len < 0) {
pr_err("diag: Invalid input in %s, buf: %p, len: %d\n",
pr_err("diag: Invalid input in %s, buf: %pK, len: %d\n",
__func__, buf, len);
return -EIO;
}
Expand Down Expand Up @@ -759,7 +759,7 @@ static int diag_dci_remove_req_entry(unsigned char *buf, int len,
{
uint16_t rsp_count = 0, delayed_rsp_id = 0;
if (!buf || len <= 0 || !entry) {
pr_err("diag: In %s, invalid input buf: %p, len: %d, entry: %p\n",
pr_err("diag: In %s, invalid input buf: %pK, len: %d, entry: %pK\n",
__func__, buf, len, entry);
return -EIO;
}
Expand Down Expand Up @@ -813,7 +813,7 @@ static void dci_process_ctrl_status(unsigned char *buf, int len, int token)
int peripheral_mask, status;

if (!buf || (len < sizeof(struct diag_ctrl_dci_status))) {
pr_err("diag: In %s, invalid buf %p or length: %d\n",
pr_err("diag: In %s, invalid buf %pK or length: %d\n",
__func__, buf, len);
return;
}
Expand Down Expand Up @@ -1939,7 +1939,7 @@ int diag_process_dci_transaction(unsigned char *buf, int len)
mutex_unlock(&driver->dci_mutex);
return -ENOMEM;
}
pr_debug("diag: head of dci log mask %p\n", head_log_mask_ptr);
pr_debug("diag: head of dci log mask %pK\n", head_log_mask_ptr);
count = 0; /* iterator for extracting log codes */

while (count < num_codes) {
Expand Down Expand Up @@ -1969,7 +1969,7 @@ int diag_process_dci_transaction(unsigned char *buf, int len)
while (log_mask_ptr && (offset < DCI_LOG_MASK_SIZE)) {
if (*log_mask_ptr == equip_id) {
found = 1;
pr_debug("diag: find equip id = %x at %p\n",
pr_debug("diag: find equip id = %x at %pK\n",
equip_id, log_mask_ptr);
break;
} else {
Expand Down Expand Up @@ -2053,7 +2053,7 @@ int diag_process_dci_transaction(unsigned char *buf, int len)
mutex_unlock(&driver->dci_mutex);
return -ENOMEM;
}
pr_debug("diag: head of dci event mask %p\n", event_mask_ptr);
pr_debug("diag: head of dci event mask %pK\n", event_mask_ptr);
count = 0; /* iterator for extracting log codes */
while (count < num_codes) {
if (read_len >= USER_SPACE_DATA) {
Expand Down Expand Up @@ -2941,9 +2941,9 @@ int diag_dci_write_proc(uint8_t peripheral, int pkt_type, char *buf, int len)
if (!buf || peripheral >= NUM_PERIPHERALS || len < 0 ||
!(driver->feature[PERIPHERAL_MODEM].rcvd_feature_mask)) {
DIAG_LOG(DIAG_DEBUG_DCI,
"buf: 0x%p, p: %d, len: %d, f_mask: %d\n",
"buf: 0x%pK, p: %d, len: %d, f_mask: %d\n",
buf, peripheral, len,
driver->feature[peripheral].rcvd_feature_mask);
driver->feature[PERIPHERAL_MODEM].rcvd_feature_mask);
return -EINVAL;
}

Expand Down
18 changes: 9 additions & 9 deletions drivers/char/diag/diag_debugfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
/* Copyright (c) 2011-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
Expand Down Expand Up @@ -428,7 +428,7 @@ static ssize_t diag_dbgfs_read_usbinfo(struct file *file, char __user *ubuf,
bytes_written = scnprintf(buf+bytes_in_buffer, bytes_remaining,
"id: %d\n"
"name: %s\n"
"hdl: %p\n"
"hdl: %pK\n"
"connected: %d\n"
"diag state: %d\n"
"enabled: %d\n"
Expand Down Expand Up @@ -527,7 +527,7 @@ static ssize_t diag_dbgfs_read_smdinfo(struct file *file, char __user *ubuf,
bytes_written = scnprintf(buf+bytes_in_buffer,
bytes_remaining,
"name\t\t:\t%s\n"
"hdl\t\t:\t%p\n"
"hdl\t\t:\t%pK\n"
"inited\t\t:\t%d\n"
"opened\t\t:\t%d\n"
"diag_state\t:\t%d\n"
Expand Down Expand Up @@ -633,7 +633,7 @@ static ssize_t diag_dbgfs_read_socketinfo(struct file *file, char __user *ubuf,
bytes_written = scnprintf(buf+bytes_in_buffer,
bytes_remaining,
"name\t\t:\t%s\n"
"hdl\t\t:\t%p\n"
"hdl\t\t:\t%pK\n"
"inited\t\t:\t%d\n"
"opened\t\t:\t%d\n"
"diag_state\t:\t%d\n"
Expand Down Expand Up @@ -823,9 +823,9 @@ static ssize_t diag_dbgfs_read_mhiinfo(struct file *file, char __user *ubuf,
"bridge index: %s\n"
"mempool: %s\n"
"read ch opened: %d\n"
"read ch hdl: %p\n"
"read ch hdl: %pK\n"
"write ch opened: %d\n"
"write ch hdl: %p\n"
"write ch hdl: %pK\n"
"read work pending: %d\n"
"read done work pending: %d\n"
"open work pending: %d\n"
Expand Down Expand Up @@ -900,9 +900,9 @@ static ssize_t diag_dbgfs_read_bridge(struct file *file, char __user *ubuf,
"type: %d\n"
"inited: %d\n"
"ctxt: %d\n"
"dev_ops: %p\n"
"dci_read_buf: %p\n"
"dci_read_ptr: %p\n"
"dev_ops: %pK\n"
"dci_read_buf: %pK\n"
"dci_read_ptr: %pK\n"
"dci_read_len: %d\n\n",
info->id,
info->name,
Expand Down
28 changes: 14 additions & 14 deletions drivers/char/diag/diag_masks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ static void diag_send_time_sync_update(uint8_t peripheral)

if (!driver->diagfwd_cntl[peripheral] ||
!driver->diagfwd_cntl[peripheral]->ch_open) {
pr_err("diag: In %s, control channel is not open, p: %d, %p\n",
pr_err("diag: In %s, control channel is not open, p: %d, %pK\n",
__func__, peripheral, driver->diagfwd_cntl[peripheral]);
return;
}
Expand Down Expand Up @@ -433,7 +433,7 @@ static void diag_send_feature_mask_update(uint8_t peripheral)

if (!driver->diagfwd_cntl[peripheral] ||
!driver->diagfwd_cntl[peripheral]->ch_open) {
pr_err("diag: In %s, control channel is not open, p: %d, %p\n",
pr_err("diag: In %s, control channel is not open, p: %d, %pK\n",
__func__, peripheral, driver->diagfwd_cntl[peripheral]);
return;
}
Expand Down Expand Up @@ -484,7 +484,7 @@ static int diag_cmd_get_ssid_range(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &msg_mask : info->msg_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -530,7 +530,7 @@ static int diag_cmd_get_build_mask(unsigned char *src_buf, int src_len,
struct diag_msg_build_mask_t rsp;

if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d\n",
__func__, src_buf, src_len, dest_buf, dest_len);
return -EINVAL;
}
Expand Down Expand Up @@ -587,7 +587,7 @@ static int diag_cmd_get_msg_mask(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &msg_mask : info->msg_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -645,7 +645,7 @@ static int diag_cmd_set_msg_mask(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &msg_mask : info->msg_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -758,7 +758,7 @@ static int diag_cmd_set_all_msg_mask(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &msg_mask : info->msg_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -811,7 +811,7 @@ static int diag_cmd_get_event_mask(unsigned char *src_buf, int src_len,
struct diag_event_mask_config_t rsp;

if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d\n",
__func__, src_buf, src_len, dest_buf, dest_len);
return -EINVAL;
}
Expand Down Expand Up @@ -853,7 +853,7 @@ static int diag_cmd_update_event_mask(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &event_mask : info->event_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -909,7 +909,7 @@ static int diag_cmd_toggle_events(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &event_mask : info->event_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -964,7 +964,7 @@ static int diag_cmd_get_log_mask(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &log_mask : info->log_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -1046,7 +1046,7 @@ static int diag_cmd_get_log_range(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &log_mask : info->log_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -1090,7 +1090,7 @@ static int diag_cmd_set_log_mask(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &log_mask : info->log_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down Expand Up @@ -1210,7 +1210,7 @@ static int diag_cmd_disable_log_mask(unsigned char *src_buf, int src_len,
mask_info = (!info) ? &log_mask : info->log_mask;
if (!src_buf || !dest_buf || src_len <= 0 || dest_len <= 0 ||
!mask_info) {
pr_err("diag: Invalid input in %s, src_buf: %p, src_len: %d, dest_buf: %p, dest_len: %d, mask_info: %p\n",
pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",
__func__, src_buf, src_len, dest_buf, dest_len,
mask_info);
return -EINVAL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/diag/diag_memorydevice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ int diag_md_write(int id, unsigned char *buf, int len, int ctx)
if (ch->tbl[i].buf != buf)
continue;
found = 1;
pr_err_ratelimited("diag: trying to write the same buffer buf: %p, ctxt: %d len: %d at i: %d back to the table, proc: %d, mode: %d\n",
pr_err_ratelimited("diag: trying to write the same buffer buf: %pK, ctxt: %d len: %d at i: %d back to the table, proc: %d, mode: %d\n",
buf, ctx, ch->tbl[i].len,
i, id, driver->logging_mode);
}
Expand Down
11 changes: 6 additions & 5 deletions drivers/char/diag/diag_usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ static void diag_usb_buf_tbl_remove(struct diag_usb_info *usb_info,
list_for_each_safe(start, temp, &usb_info->buf_tbl) {
entry = list_entry(start, struct diag_usb_buf_tbl_t, track);
if (entry->buf == buf) {
DIAG_LOG(DIAG_DEBUG_MUX, "ref_count-- for %p\n", buf);
DIAG_LOG(DIAG_DEBUG_MUX, "ref_count-- for %pK\n", buf);
atomic_dec(&entry->ref_count);
/*
* Remove reference from the table if it is the
Expand All @@ -155,7 +155,7 @@ static struct diag_usb_buf_tbl_t *diag_usb_buf_tbl_get(
list_for_each_safe(start, temp, &usb_info->buf_tbl) {
entry = list_entry(start, struct diag_usb_buf_tbl_t, track);
if (entry->buf == buf) {
DIAG_LOG(DIAG_DEBUG_MUX, "ref_count-- for %p\n", buf);
DIAG_LOG(DIAG_DEBUG_MUX, "ref_count-- for %pK\n", buf);
atomic_dec(&entry->ref_count);
return entry;
}
Expand Down Expand Up @@ -303,7 +303,7 @@ static void diag_usb_write_done(struct diag_usb_info *ch,
ch->write_cnt++;
entry = diag_usb_buf_tbl_get(ch, req->context);
if (!entry) {
pr_err_ratelimited("diag: In %s, unable to find entry %p in the table\n",
pr_err_ratelimited("diag: In %s, unable to find entry %pK in the table\n",
__func__, req->context);
return;
}
Expand Down Expand Up @@ -395,7 +395,7 @@ static int diag_usb_write_ext(struct diag_usb_info *usb_info,
struct diag_request *req = NULL;

if (!usb_info || !buf || len <= 0) {
pr_err_ratelimited("diag: In %s, usb_info: %p buf: %p, len: %d\n",
pr_err_ratelimited("diag: In %s, usb_info: %pK buf: %pK, len: %d\n",
__func__, usb_info, buf, len);
return -EINVAL;
}
Expand Down Expand Up @@ -515,7 +515,8 @@ int diag_usb_write(int id, unsigned char *buf, int len, int ctxt)

spin_lock_irqsave(&usb_info->write_lock, flags);
if (diag_usb_buf_tbl_add(usb_info, buf, len, ctxt)) {
DIAG_LOG(DIAG_DEBUG_MUX, "ERR! unable to add buf %p to table\n",
DIAG_LOG(DIAG_DEBUG_MUX,
"ERR! unable to add buf %pK to table\n",
buf);
diagmem_free(driver, req, usb_info->mempool);
spin_unlock_irqrestore(&usb_info->write_lock, flags);
Expand Down
Loading