Commit graph

593967 commits

Author SHA1 Message Date
Linux Build Service Account
e10b471b51 Merge "FROMLIST: binder: fix memory corruption in binder_transaction binder" 2017-10-05 16:10:07 -07:00
Linux Build Service Account
9e61cad143 Merge "sched: Make resched_cpu() unconditional" 2017-10-05 16:10:06 -07:00
Linux Build Service Account
9b952ff615 Merge "rcu: Stop disabling interrupts in scheduler fastpaths" 2017-10-05 16:10:04 -07:00
Linux Build Service Account
f5684568b9 Merge "iio: qcom-rradc: Disable continuous mode when read fails" 2017-10-05 16:10:03 -07:00
Linux Build Service Account
9a6c530f34 Merge "defconfig: msm-auto: Enbale CONFIG_SLUB_DEBUG_ON" 2017-10-05 16:10:02 -07:00
Linux Build Service Account
699891bf07 Merge "ARM: dts: msm: change smb138x_parallel_slave node name" 2017-10-05 16:10:01 -07:00
Linux Build Service Account
4afd92d32e Merge "drm/msm: Remove too many hdmi_i2c_xfer warnings" 2017-10-05 16:10:00 -07:00
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
Subbaraman Narayanamurthy
8c20990f43 iio: qcom-rradc: Disable continuous mode when read fails
Currently, when a channel is read in continuous mode and the read
operation fails, RR_ADC would be left enabled in continuous mode.
Disable the continuous mode in such cases so that the other read
operations which doesn't need continuous mode can go through.

Change-Id: I2bf257bd535e1e4a30e18b6257e584a5be96b69d
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2017-10-03 12:35:39 -07:00
Xu YiPing
d1bb6af231 FROMLIST: binder: fix memory corruption in binder_transaction binder
(from https://patchwork.kernel.org/patch/9939405/)

commit 7a4408c6bd3e ("binder: make sure accesses to proc/thread are
safe") made a change to enqueue tcomplete to thread->todo before
enqueuing the transaction. However, in err_dead_proc_or_thread case,
the tcomplete is directly freed, without dequeued. It may cause the
thread->todo list to be corrupted.

So, dequeue it before freeing.

Bug: 65333488
Change-Id: I14ef48095d9f690148b1a50ea62d05dd67779505
Signed-off-by: Xu YiPing <xuyiping@hisilicon.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
Git-commit: 86578a0fd70edffb11c78b5df85b8e113e44bfe1
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
2017-10-03 00:33:19 -07:00
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
Paul E. McKenney
15a19dd355 sched: Make resched_cpu() unconditional
The current implementation of synchronize_sched_expedited() incorrectly
assumes that resched_cpu() is unconditional, which it is not.  This means
that synchronize_sched_expedited() can hang when resched_cpu()'s trylock
fails as follows (analysis by Neeraj Upadhyay):

o    CPU1 is waiting for expedited wait to complete:
sync_rcu_exp_select_cpus
     rdp->exp_dynticks_snap & 0x1   // returns 1 for CPU5
     IPI sent to CPU5

synchronize_sched_expedited_wait
         ret = swait_event_timeout(
                                     rsp->expedited_wq,
  sync_rcu_preempt_exp_done(rnp_root),
                                     jiffies_stall);

            expmask = 0x20 , and CPU 5 is in idle path (in cpuidle_enter())

o    CPU5 handles IPI and fails to acquire rq lock.

Handles IPI
     sync_sched_exp_handler
         resched_cpu
             returns while failing to try lock acquire rq->lock
         need_resched is not set

o    CPU5 calls  rcu_idle_enter() and as need_resched is not set, goes to
     idle (schedule() is not called).

o    CPU 1 reports RCU stall.

Given that resched_cpu() is now used only by RCU, this commit fixes the
assumption by making resched_cpu() unconditional.

Change-Id: I67cbf28612004f4b78e355dd00b5abdd0f31ec13
Reported-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Suggested-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Patch-mainline: linux-kernel @ 18/09/17, 09:01
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-10-03 00:06:48 -07:00