Commit graph

593951 commits

Author SHA1 Message Date
Linux Build Service Account
52b59ba4bd Merge "msm: mdss: dp: fix handling of device shutdown with cable connected" 2017-10-05 16:09:59 -07:00
Linux Build Service Account
92a03ca537 Merge "wil6210: support AOA in FTM session" 2017-10-05 16:09:58 -07:00
Linux Build Service Account
3def0fa97f Merge "ARM: enable vmalloc saving" 2017-10-05 16:09:57 -07:00
Linux Build Service Account
0d13390c0a Merge "netfilter: xt_socket: Restore mark from full sockets only" 2017-10-05 16:09:56 -07:00
Linux Build Service Account
5ef257fe14 Merge "soc: qcom: glink: Free if_ptr before freeing dummy transport" 2017-10-05 16:09:55 -07:00
Linux Build Service Account
6f710cc042 Merge "spcom: spcom_get_next_request_size() unlock while waiting for rx data" 2017-10-05 16:09:54 -07:00
Linux Build Service Account
f8bec54357 Merge "spcom: avoid using stale glink handle" 2017-10-05 16:09:52 -07:00
Linux Build Service Account
75d9384cc4 Merge "msm:ipa: Fix to slab out of bounds access" 2017-10-05 16:09:51 -07:00
Linux Build Service Account
8a0ae03d44 Merge "mmc: block: Unhalt the command queue before releasing mmc host" 2017-10-05 16:09:50 -07:00
Linux Build Service Account
d640f06626 Merge "msm: kgsl: Fix size check issue in _read_fw2_block_header()" 2017-10-05 16:09:49 -07:00
Linux Build Service Account
afd458fbee Merge "msm: kgsl: Fix calculation of size in _load_regfile" 2017-10-05 16:09:48 -07:00
Linux Build Service Account
928b34b6b3 Merge "mmc: sdhci-msm: flush mmc detect work asynchronously." 2017-10-05 16:09:46 -07:00
Linux Build Service Account
6963c78e4d Merge "fb/msm: add support for HDR playback control sequence" 2017-10-05 16:09:45 -07:00
Linux Build Service Account
0c90b04235 Merge "ath10k: Vote for hardware resources for WCN3990" 2017-10-05 16:09:44 -07:00
Linux Build Service Account
a564649444 Merge "iommu: free io pgtable during domain detach." 2017-10-05 16:09:43 -07:00
Linux Build Service Account
53ce371186 Merge "msm: wlan: Update regulatory database" 2017-10-05 16:09:42 -07:00
Linux Build Service Account
f7b404c71e Merge "cgroupns: Close race between cgroup_post_fork and copy_cgroup_ns" 2017-10-05 16:09:41 -07:00
Linux Build Service Account
175a78586f Merge "msm: ipa3: add lock for num_q6_rule" 2017-10-05 16:09:40 -07:00
Linux Build Service Account
b889d4d995 Merge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996v3" 2017-10-05 03:06:51 -07:00
Linux Build Service Account
98871f5864 Merge "ASoC: sdm660_cdc: Fix HPH CnP and kernel panic issue on sdm660-internal" 2017-10-05 03:06:50 -07:00
Linux Build Service Account
12be975dcf Merge "msm: ipa: prevent string buffer overflows" 2017-10-05 03:06:48 -07:00
Linux Build Service Account
f43806fb3e Merge "msm: kgsl: Use a lock when updating the sparse bindings" 2017-10-05 03:06:47 -07:00
Linux Build Service Account
cb474c5398 Merge "scsi: ufs: Change power mode on line reset" 2017-10-05 03:06:46 -07:00
Linux Build Service Account
abb2448f18 Merge "usb: gadget: gsi: Avoid spinlock lockup" 2017-10-05 03:06:45 -07:00
Linux Build Service Account
bcecf2ddf8 Merge "ARM: dts: msm: Add fastrpc vmid flag for sdm660" 2017-10-05 03:06:44 -07:00
Linux Build Service Account
41c3357a3d Merge "ARM: dts: msm: Allow pm_suspend in host mode for msm8996 ADP" 2017-10-05 03:06:43 -07:00
Linux Build Service Account
258407248b Merge "usb: dwc3-msm: Allow PM suspend in host mode irrespective of runtimePM" 2017-10-05 03:06:42 -07:00
Linux Build Service Account
668a016621 Merge "platform: msm: Fix USB device does not enumerate in SS mode" 2017-10-05 03:06:40 -07:00
Linux Build Service Account
7eb529ae69 Merge "msm: camera: Add support for plain16 mode" 2017-10-05 03:06:39 -07:00
Linux Build Service Account
725d7669a0 Merge "diag: Add NULL pointer checks for mask info" 2017-10-05 03:06:38 -07:00
Linux Build Service Account
dfa529b414 Merge "ASoC: msm: qdsp6v2: updating downmix/pan_scale control type to bytes" 2017-10-05 03:06:37 -07:00
Linux Build Service Account
ff06c973ae Merge "defconfig: msm-auto: Enable CNSS2 platform driver" 2017-10-05 03:06:36 -07:00
Linux Build Service Account
56fee295de Merge "msm: mdss: check the length of the external input buffer properly" 2017-10-05 03:06:35 -07:00
Linux Build Service Account
db14d92031 Merge "clk: msm: mdss: add support for chip serial number in dfps info" 2017-10-05 03:06:34 -07:00
Linux Build Service Account
ae8fef7239 Merge "ASoC: msm: qdsp6v2: primary plus 8 interactive stream playback fix" 2017-10-05 03:06:33 -07:00
Sathish Kumar
43cbf71858 ARM: dts: msm: Add GPU speed bin 2 support for MSM8996v3
GPU speed-bin 2 supports fmax of 560MHz and DDR 1555MHz.
Add this config to MSM8996v3 to support required GPU fmax.

Change-Id: Ibdf9bb63c7d8f0e980fbf3c192d536adeaeec52d
Signed-off-by: Dumpeti Sathish Kumar <sathyanov14@codeaurora.org>
2017-10-04 23:38:02 -07:00
Lynus Vaz
ccd73c76f2 msm: kgsl: Use a lock when updating the sparse bindings
Use the appropriate lock when adding sparse bindings, to protect the
list of sparse bindings from concurrent updates by multiple threads.

Change-Id: Ice9750c96fca42f4049ed352533f4722b5166221
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-10-04 11:13:46 +05:30
Lynus Vaz
5b4f3d1608 msm: kgsl: Bail out when two threads add sparse bindings
If we find that a different thread has already added bindings at the
same offset we wanted to add to the sparse object, don't get stuck in
an infinite loop, and return with an error.

Change-Id: I6b17c91eccb14c07e13cae24135dfe7b13f3301d
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-10-04 11:13:46 +05:30
Mohammed Javid
92db5ba9ef msm: ipa: prevent string buffer overflows
In WAN ioctls user-supplied data structures
contain string members,but there's no guarantee
they're null-terminated, add the string terminator
to prevent vulnerability of string buffer overflows.

Change-Id: I17c06c94aa619a2cd3a678c495a31541a65a7741
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2017-10-04 11:13:12 +05:30
Tharun Kumar Merugu
82b1358189 ARM: dts: msm: Add fastrpc vmid flag for sdm660
Add device specific flag for new vmid heap shared feature.

Change-Id: I35cc0073a5fa10c715d520ebb9d77936a6820aa9
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-10-03 12:54:36 +05:30
Pratham Pratap
8f84d3cbc8 usb: gadget: gsi: Avoid spinlock lockup
In this case gsi_ctrl_clear_cpkt_queues function is called
which is holding spinlock and in the meantime dwc3_interrupt
occurred on same CPU which in turn is calling gsi_ctrl_clear_cpkt_queues
function and it is trying to acquire the same spinlock causing
deadlock.

This change disables the interrupts when spinlock is acquired
in gsi_ctrl_clear_cpkt_queues function.

Change-Id: Ia87a0a283ca6b6298083dddb448e4d649a4f8e89
Signed-off-by: Pratham Pratap <prathampratap@codeaurora.org>
2017-10-02 23:23:58 -07:00
Asutosh Das
492d614a96 scsi: ufs: Change power mode on line reset
Line reset can occur during hibernate enter, exit or
during PA_INIT. In some cases, system slowness problem
is observed when line reset happened during hibernate
enter process in auto hibernate mode of operation as
link remains in PWM-G1 mode. To fix this problem, read
PA_PWRmode, PA_TxGear and PA_RxGear if line reset is
detected and if link is in PWM-G1 mode, initiate power
mode change to expected HS gear.

Change-Id: Ic06a11c917e8954743c4dcf80b89fedeec4584ed
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-10-03 10:56:52 +05:30
Linux Build Service Account
bd20893138 Merge "msm: wlan: Update regulatory database" 2017-09-29 06:47:29 -07:00
Subash Abhinov Kasiviswanathan
cd9b0ed210 netfilter: xt_socket: Restore mark from full sockets only
An out of bounds error was detected on an ARM64 target with
Android based kernel 4.9. This occurs while trying to
restore mark on a skb from an inet request socket.

BUG: KASAN: slab-out-of-bounds in socket_match.isra.2+0xc8/0x1f0 net/netfilter/xt_socket.c:248
Read of size 4 at addr ffffffc06a8d824c by task syz-fuzzer/1532
CPU: 7 PID: 1532 Comm: syz-fuzzer Tainted: G        W  O    4.9.41+ #1
Call trace:
[<ffffff900808d2f8>] dump_backtrace+0x0/0x440 arch/arm64/kernel/traps.c:76
[<ffffff900808d760>] show_stack+0x28/0x38 arch/arm64/kernel/traps.c:226
[<ffffff90085f7dc8>] __dump_stack lib/dump_stack.c:15 [inline]
[<ffffff90085f7dc8>] dump_stack+0xe4/0x134 lib/dump_stack.c:51
[<ffffff900830f358>] print_address_description+0x68/0x258 mm/kasan/report.c:248
[<ffffff900830f770>] kasan_report_error mm/kasan/report.c:347 [inline]
[<ffffff900830f770>] kasan_report.part.2+0x228/0x2f0 mm/kasan/report.c:371
[<ffffff900830fdec>] kasan_report+0x5c/0x70 mm/kasan/report.c:372
[<ffffff900830de98>] check_memory_region_inline mm/kasan/kasan.c:308 [inline]
[<ffffff900830de98>] __asan_load4+0x88/0xa0 mm/kasan/kasan.c:740
[<ffffff90097498f8>] socket_match.isra.2+0xc8/0x1f0 net/netfilter/xt_socket.c:248
[<ffffff9009749a5c>] socket_mt4_v1_v2_v3+0x3c/0x48 net/netfilter/xt_socket.c:272
[<ffffff90097f7e4c>] ipt_do_table+0x54c/0xad8 net/ipv4/netfilter/ip_tables.c:311
[<ffffff90097fcf14>] iptable_mangle_hook+0x6c/0x220 net/ipv4/netfilter/iptable_mangle.c:90
...
Allocated by task 1532:
 save_stack_trace_tsk+0x0/0x2a0 arch/arm64/kernel/stacktrace.c:131
 save_stack_trace+0x28/0x38 arch/arm64/kernel/stacktrace.c:215
 save_stack mm/kasan/kasan.c:495 [inline]
 set_track mm/kasan/kasan.c:507 [inline]
 kasan_kmalloc+0xd8/0x188 mm/kasan/kasan.c:599
 kasan_slab_alloc+0x14/0x20 mm/kasan/kasan.c:537
 slab_post_alloc_hook mm/slab.h:417 [inline]
 slab_alloc_node mm/slub.c:2728 [inline]
 slab_alloc mm/slub.c:2736 [inline]
 kmem_cache_alloc+0x14c/0x2e8 mm/slub.c:2741
 reqsk_alloc include/net/request_sock.h:87 [inline]
 inet_reqsk_alloc+0x4c/0x238 net/ipv4/tcp_input.c:6236
 tcp_conn_request+0x2b0/0xea8 net/ipv4/tcp_input.c:6341
 tcp_v4_conn_request+0xe0/0x100 net/ipv4/tcp_ipv4.c:1256
 tcp_rcv_state_process+0x384/0x18a8 net/ipv4/tcp_input.c:5926
 tcp_v4_do_rcv+0x2f0/0x3e0 net/ipv4/tcp_ipv4.c:1430
 tcp_v4_rcv+0x1278/0x1350 net/ipv4/tcp_ipv4.c:1709
 ip_local_deliver_finish+0x174/0x3e0 net/ipv4/ip_input.c:216

CRs-Fixed: 2113103
Change-Id: I1e81238aa2b8abe768d460674978f554b6c3ca48
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2017-09-28 08:07:29 -07:00
Dhoat Harpal
10181e6279 soc: qcom: glink: Free if_ptr before freeing dummy transport
Dummy transport is only way to access if_ptr. When dummy
transport is freed, if_ptr allocated for dummy transport is
not freed. This result in memory leak.

kfree of if_ptr is called before freeing dummy transport.

CRs-Fixed: 2116744
Change-Id: I832e0fcde418b7c3d992f50e817866bc9075da3c
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-09-28 07:57:52 -07:00
Dhoat Harpal
664fcc0919 soc: qcom: glink: Free data memory before freeing intent
Data of intent is not freed even in purge_intent_list. This results
in memory leak.

Kfree is done for data before freeing intent.

CRs-Fixed: 2116744
Change-Id: Ib99261208df1cc9b63b4cd0a35ac0c7942efb4a8
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-09-28 07:57:21 -07:00
Samyukta Mogily
3ce513c201 msm: camera: Add support for plain16 mode
Add sensor formats for 10 bit csid plain16.

Change-Id: Ib9477f59803f5a14dfd42dfda016e090fada3028
Signed-off-by: Samyukta Mogily <smogily@codeaurora.org>
2017-09-28 03:34:21 -07:00
Prakash Gupta
283e2a920d ARM: enable vmalloc saving
For some targets that have less vmalloc space this can be increased by
enabling config ENABLE_VMALLOC_SAVING. With this config we can reclaim
virtual mappings which remains unused because of non hlos carveout
reservations in lowmem.

Select the default method of reclaiming virtual memory as vmalloc saving.

Change-Id: I05bbae3b554be54f74b740404dda0cdfa89084bd
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-09-28 15:51:56 +05:30
Aravind Venkateswaran
04e88e68ee msm: mdss: dp: fix handling of device shutdown with cable connected
When the source is powered off with an external sink connected, it
will result in a call to blank and power off the source. In the
current implementation, sink is not transitioned to D3 power mode
prior to turning off the source. This can result in the sink
reporting signal lock failures as the source if powered off,
resulting in an HPD IRQ interrupt. If this interrupt is handled
after the DP controller is powered off, it can lead to unclocked
register accesses. Fix this by ensuring that sink is powered off
prior to powering off the source. In addition, ensure that no more
attention events are handled once the DP controller is powered off.

Change-Id: I08558229f7c3e603904527de58a39039b3d7615e
Signed-off-by: Aravind Venkateswaran <aravindh@codeaurora.org>
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2017-09-28 14:17:06 +05:30
Amir Samuelov
aef18b277c spcom: spcom_get_next_request_size() unlock while waiting for rx data
spcom server app might open the channel before the SP client app.
The asynchronous CONNECTED callback might be called while the server
is waiting for data.
Avoid locking the channel while waiting for data to avoid dead lock
while handling the CONNECTED callabck.

Change-Id: I7c576f240b60720a6f1461b3e48f4422c110e7c4
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2017-09-28 00:41:26 -07:00