Commit graph

587911 commits

Author SHA1 Message Date
Daniel Rosenberg
dadd3624c1 ANDROID: ion: Fix uninitialized variable
Fix an uninitialized variable in user_ion_handle_put_nolock

Change-Id: Ia634b790661089ad01aca8e5975984435463d148
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 34276203
[d-cagle@codeaurora.org: Add commit message]
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-04-20 13:18:19 -07:00
Daniel Rosenberg
8309865527 ANDROID: ion: Protect kref from userspace manipulation
This separates the kref for ion handles into two components.
Userspace requests through the ioctl will hold at most one
reference to the internally used kref. All additional requests
will increment a separate counter, and the original reference is
only put once that counter hits 0. This protects the kernel from
a poorly behaving userspace.

Bug: 34276203

Change-Id: Ibc36bc4405788ed0fea7337b541cad3be2b934c0
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Git-repo: https://android.googlesource.com/kernel/msm/
Git-commit: 20abfcc16884a5af973a5e91dd013ddd789c44f4
[d-cagle@codeaurora.org: Resolve style issues]
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-04-20 13:15:44 -07:00
Linux Build Service Account
7684fb148e Merge "msm: ipa: Fix to use GFP_DMA and add check for dma_map_single" 2017-04-19 19:27:30 -07:00
Linux Build Service Account
536cabaf9c Merge "ARM: dts: msm8998: remove extra simulator panel nodes" 2017-04-19 19:27:28 -07:00
Linux Build Service Account
3b00750d38 Merge "diag: Add validity check for process descriptor" 2017-04-19 19:27:28 -07:00
Linux Build Service Account
ccea62ce17 Merge "regulator: qpnp-oledb: Add support for LAB_VREG_NOT_OK notifier" 2017-04-19 19:27:27 -07:00
Linux Build Service Account
7ca6c92e65 Merge "regulator: qpnp-labibb: Handle LAB short circuit(SC) detection" 2017-04-19 19:27:26 -07:00
Linux Build Service Account
7514c164f1 Merge "usb: gadget: configfs: Replace strncpy with strlcpy" 2017-04-19 11:41:41 -07:00
Linux Build Service Account
1d9cf2a667 Merge "leds: qpnp-flash-v2: Enable charger mitigation" 2017-04-19 11:41:37 -07:00
Linux Build Service Account
1a597a13e8 Merge "arm64: cache: change ARCH_DMA_MINALIGN and L1_CACHE_SHIFT values" 2017-04-19 11:41:36 -07:00
Linux Build Service Account
f984c0f9a0 Merge "ARM: dts: msm: update VDD_APC margin adjustments for msm8998v2" 2017-04-19 11:41:35 -07:00
Linux Build Service Account
a69827fe6d Merge "defconfig: msm: enable vndbinder for sdm660 and msmcortex" 2017-04-19 11:41:34 -07:00
Manu Gautam
851175d661 usb: gadget: configfs: Replace strncpy with strlcpy
Use safer version of strcpy i.e. strlcpy instead of
strncpy for NULL terminated strings.

Change-Id: I5e2800d1d539545744a1b1231e1d589a7c92797a
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>
2017-04-19 04:05:56 -07:00
Gopikrishna Mogasati
296e5025fa diag: Add validity check for process descriptor
This fix checks the validity of memory device session's
process descriptor before issuing a signal to it while
subsystem restart is performed. This fix avoids accessing
of cleaned-up process descriptor's fields.

CRs-Fixed: 2034816
Change-Id: I2725d3348fbeb8290c887cccea4bca6d41c5b184
Signed-off-by: Gopikrishna Mogasati <gmogas@codeaurora.org>
2017-04-19 15:58:32 +05:30
Kiran Gunda
6c86753b0d regulator: qpnp-oledb: Add support for LAB_VREG_NOT_OK notifier
Register a notifier callback for LAB_VREG_NOT_OK, which is triggered
by the LABIBB driver when short circuit(SC) is detected on the LAB
rail. Disable the OLEDB module upon receiving the LAB_VREG_NOT_OK
notification.

Change-Id: Ia3cc19d9a3c2f32acc413677a9ea4b3100464cd2
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-19 02:30:41 -07:00
Kiran Gunda
91a6162f19 regulator: qpnp-labibb: Handle LAB short circuit(SC) detection
On certain PMICs, there is no short circuit (SC) detection available
in LAB module. Add support to detect it manually and disable LAB/IBB
module upon SC detection. In addition, notify it to OLEDB driver to
disable OLEDB module.

Change-Id: I2a9dc5b1ae8ece45c85b3992026c7f389fd4d135
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-19 14:47:26 +05:30
Neeraj Upadhyay
5e9e067d19 defconfig: msm: enable vndbinder for sdm660 and msmcortex
Restore default android binder domains. As 'binder,hwbinder,vndbinder'
is the default, this change enables vndbinder.

Change-Id: I48ce75fc6090ad3d9a5b66ca437acbde5a913751
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-04-19 02:01:54 -07:00
Utkarsh Saxena
314c7a8de6 msm: ipa: Fix to use GFP_DMA and add check for dma_map_single
IPAv2 hardware works with 32 bit addressing,
so allocate a kernel memory using GFP_DMA flag
which is processed by IPA hardware.

Add a error check for return of dma_map_single
using dma_mapping_error API.

Change-Id: I08e3eec8e9b2d81f945283a72338c0a8f23e2ac9
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
2017-04-19 11:43:59 +05:30
Linux Build Service Account
1342831f8a Merge "qcom: smblib: report discharging in case of input OV" 2017-04-18 22:19:28 -07:00
Linux Build Service Account
518e9d19b5 Merge "msm: ipa3: allocate memory for DMA task on init" 2017-04-18 22:19:27 -07:00
Linux Build Service Account
849232eb3e Merge "msm: pcie: support QGIC MSI with SMMU fastmap enabled" 2017-04-18 22:19:26 -07:00
Linux Build Service Account
984ec0d1e7 Merge "msm: mdss: Wait for VSYNC after continuous splash handoff" 2017-04-18 22:19:24 -07:00
Linux Build Service Account
e34cc21861 Merge "usb: phy: qmp: Remove extra debug log" 2017-04-18 22:19:24 -07:00
Linux Build Service Account
aadfc6d284 Merge "power: smb-lib: WA to fix legacy cable detection" 2017-04-18 22:19:21 -07:00
Linux Build Service Account
64cf255adf Merge "soc: qcom: qpnp-haptic: Optimize updating RATE_CFG registers" 2017-04-18 22:19:19 -07:00
Linux Build Service Account
c5371f74c8 Merge "msm: mdss: reset cdm block after used" 2017-04-18 22:19:18 -07:00
Linux Build Service Account
ce87c90172 Merge "lowmemorykiller: fix scan_mutex contention" 2017-04-18 13:57:02 -07:00
Linux Build Service Account
be57574adf Merge "soc: qcom: spcom: validate rx_buf in spcom_rx before usage" 2017-04-18 13:57:01 -07:00
Linux Build Service Account
dcdd543fe1 Merge "wil6210: add option to load FTM FW" 2017-04-18 13:56:59 -07:00
Linux Build Service Account
68cbe2822c Merge "mm: separate out the invocation of lowmemorykiller shrinker" 2017-04-18 13:56:59 -07:00
Linux Build Service Account
2dfa6e303f Merge "wil6210: Improve AP stop handling" 2017-04-18 13:56:57 -07:00
Linux Build Service Account
f574243fae Merge "regulator: qpnp-oledb: Add revid support for OLEDB driver" 2017-04-18 13:56:56 -07:00
Linux Build Service Account
fe484ee85a Merge "power: smb-lib: start CC2 removal WA when VBUS is low" 2017-04-18 13:56:55 -07:00
Linux Build Service Account
a4da2aadd9 Merge "ANDROID: Refactor fs readpage/write tracepoints." 2017-04-18 13:56:54 -07:00
Linux Build Service Account
74cf65d68c Merge "ANDROID: fs: FS tracepoints to track IO." 2017-04-18 13:56:53 -07:00
Linux Build Service Account
e46437e997 Merge "crypto: msm: Fix buffer overflow issue" 2017-04-18 13:56:52 -07:00
Linux Build Service Account
9fbdcef1d5 Merge "qcom: qnovo: allow charger error conditions to disable qnovo" 2017-04-18 13:56:50 -07:00
Skylar Chang
e01629963c msm: ipa3: allocate memory for DMA task on init
On some conditions, such as reboot, the allocation context
for DMA task might be a user space processes with SIGKILL.
Pre allocate this buffer to avoid DMA allocation failure.

Change-Id: Ie0c5ecbb7aebbf03c42c2f8976aad40e9987fd4a
CRs-Fixed: 2032907
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-04-18 11:34:11 -07:00
Imran Khan
7b9683892c arm64: cache: change ARCH_DMA_MINALIGN and L1_CACHE_SHIFT values
This reverts 'commit 9730348075 ("arm64: Increase the max
granular size") and also sets ARM_DMA_MINALIGN to 128.
ARCH_DMA_MINALIGN is dependent on L1_CACHE_SHIFT but it should
be set to maximum *known* cache line size on ARMv8 systems to
avoid DMA coherecy issues. So setting ARM_DMA_MINALIGN to 128.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Change-Id: Ie771d1b693789fce8793538a6efddfe68e2a0043
Patch-mainline: linux-kernel @ 21/03/16, 17:14:03
Signed-off-by: Imran Khan <kimran@codeaurora.org>
2017-04-18 08:04:28 -07:00
Linux Build Service Account
50a43711dc Merge "ARM: dts: msm: Add reserved channel for MSM8998/SDM660/SDM630" 2017-04-18 06:29:59 -07:00
Linux Build Service Account
758e42fa64 Merge "ASoC: msm: qdsp6v2: Enable AFE sidetone based on mixer ctl setting" 2017-04-18 06:29:59 -07:00
Linux Build Service Account
90ec95150b Merge "ASoC: msm8998: Add check before dereferencing pointer" 2017-04-18 06:29:44 -07:00
Linux Build Service Account
b0f3600e32 Merge "clk: qcom: Update the hmss_gpll0_clk_src to 300MHz" 2017-04-18 06:29:44 -07:00
Linux Build Service Account
00dfbd4a98 Merge "qcom: smb2: Fix FCC/Float voltage configuration from device tree" 2017-04-18 06:29:43 -07:00
Linux Build Service Account
0fe2dba74c Merge "spmi: pmic-arb: Reserve a channel for debug port" 2017-04-18 06:29:42 -07:00
Linux Build Service Account
3327a91410 Merge "defconfig: msmcortex: Enable 8021Q config for APQ8098" 2017-04-18 06:29:41 -07:00
Linux Build Service Account
706c26b417 Merge "msm: isp: initialize pd stats buffer index" 2017-04-18 06:29:40 -07:00
Linux Build Service Account
c5c36cb00b Merge "msm: mdss: wait for one commit transfer for command mode after resume" 2017-04-18 06:29:39 -07:00
Linux Build Service Account
3c15507fd1 Merge "msm: camera: isp: Detect dual camera out of sync using time" 2017-04-18 06:29:31 -07:00
Liangliang Lu
0e7130d545 usb: phy: qmp: Remove extra debug log
Remove extra debug log to keep code clean.

Change-Id: I70907bb5530574386c60d14be24e13ee7ac7015f
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2017-04-18 18:48:59 +08:00