Commit graph

581129 commits

Author SHA1 Message Date
Yuanyuan Liu
28520e0a38 icnss: Add support of FW rejuvenation
Add support of WLAN FW rejuvenation. After receiving FW
rejuvenate indication, ICNSS will start WLAN FW rejuvenation
and ack back to FW.

CRs-Fixed: 1107443
Change-Id: I127e86d8467f64534f096d58424e687d4231d7a5
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2017-01-12 12:33:07 -08:00
Yuanyuan Liu
d19122a52d icnss: Update WLFW service with FW rejuvenate related messages
Update WLFW service with FW rejuvenate related messages.
These messages are used to trigger WLAN FW rejuvenation
and update FW dynamic feature mask to FW.

CRs-Fixed: 1107443
Change-Id: If91c78b5325b177195bdcb8159542d50bd0dd01d
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2017-01-12 12:32:16 -08:00
Junzhe Zou
8081806088 mm: camera: isp: send PD stats buffer earlier
Save pdaf buf address in sof event and send it with stats
notify event.

Change-Id: If147a229f3f007f30ef563469d11b678b887ed57
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>
2017-01-12 11:24:40 -08:00
Ben Chan
d199f38207 drm/msm/sde: sde hw interrupt handling
Existing SDE HW interrupt was based on mdp/kms and is not
sufficient for supporting the SDE HW interrupt manipulation.
Changes are for enabling full SDE interrupt support and hiding
HAL interface implementation details from crtc/encoder.

Change-Id: I917a153d12bbb6b84758591ba69fe15181af7791
Signed-off-by: Ben Chan <bkchan@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:10:35 -08:00
Lloyd Atkinson
643f961532 drm/msm/sde: simplify encoder display probe logic
Cleanup the display probing logic now that the common display
interface is available.

Change-Id: I3a6f815d8e7ab7f22e719eaf7ef4c8150470d54f
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:10:34 -08:00
Clarence Ip
0190e3c975 drm/msm/sde: move sde encoder to new display interface
Call panels via common display-manager interface rather than directly.

Change-Id: I4fe86b6b206929217c0cf807a93287140d507e6c
Signed-off-by: Clarence Ip <cip@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:10:34 -08:00
Lloyd Atkinson
fe03524bee drm/msm/sde: programmable pre-fetch support for video encoders
Add support in encoder for programming early fetch in the
vertical front porch.

Change-Id: I60fcf4a4e6aea80292b590ee14506579123f372d
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:10:33 -08:00
Lloyd Atkinson
a142ec80ca drm/msm/sde: sde encoder virtualization
Split SDE encoder into virtual and physical encoders. Virtual
encoders are containers, one per logical display that contain
one or more physical encoders. Physical encoders manage the
INTF hardware.

Change-Id: I6342511c59568c76278a519b84f93338157e59fa
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:10:33 -08:00
Lloyd Atkinson
1cab338540 drm/msm/sde: add controller instance to INTF block in catalog
Controller Instance ID differentiates between INTFs of the same type.
E.g. which DSI INTF is primary, which is secondary.

Change-Id: Icc47df59a24faa2a019ab190d6c835a0ac93024d
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:10:32 -08:00
Abhijit Kulkarni
815cfffb81 drm/msm/sde: add basic sde object enumeration
Implement basic crtc, encoder, and plane support that
implements DRM atomic call sequence, queries hardware, and
enumerates resources as DRM objects. This includes basic
color format support, as well as querying of displays
to create appropriate encoders, crtcs. Also includes
supporting clock control logic.

Change-Id: I25a9c74b92262d81986b3441c89d51bff2d14dbb
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:10:32 -08:00
Adrian Salido-Moreno
29e061e200 drm/msm: add smmu handler
Add msm_smmu driver to support mapping buffers to
arm smmu memory. msm_smmu adds the hooks to support
drm hooks. Current change only supports the unsecure
domain memory. msm_gem object is also updated to attach
the new msm_smmu driver.

Change-Id: I4899bd74d8b41b864ed5e0dec2da11e929c7fa95
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:10:13 -08:00
Abhijit Kulkarni
54a4a3fb41 drm/msm/sde: add driver for sde support
Initial DRM/KMS driver to support snapdragon display engine.

Change-Id: I2f93d7cd24acf77359682f90b6b9647017ed62ba
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:08:55 -08:00
Ajay Singh Parmar
af5a0d5df1 drm/msm/dsi-staging: add catalog for dsi driver
Add catalog for DSI controller and phy drivers.

Change-Id: Iff7f55592834fef0230982282af5b8b2890f97a5
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:08:55 -08:00
Ajay Singh Parmar
a47691f8c9 drm/msm/dsi-staging: add hardware driver for dsi controller
Add hardware driver for DSI controller v1.4.

Change-Id: I74a3b5ebbde1ca43b060d6e5ba2462fb66f0a3a8
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
Signed-off-by: Krishna Srinivas Kundurthi <kskund@codeaurora.org>
2017-01-12 11:08:37 -08:00
Alexander Kolesnikov
370a1f7e66 msm: camera: Add lock/unlock to "set mode" function
The change adds a synchronization mechanism to avoid concurrent
access to the TZ App.

CRs-Fixed: 1110588
Change-Id: I1ec37133eb7fe8c3fda498e6fe6661198163e07d
Signed-off-by: Alexander Kolesnikov <akolesni@codeaurora.org>
2017-01-12 11:01:47 -08:00
Manaf Meethalavalappu Pallikunhi
378febcf62 ARM: dts: msm: Add LMH DCVSh mitigation support for KTM for sdm660
Add LMH DCVSh mitigation support for Kernel thermal driver for sdm660.
It enables KTM to request frequency mitigation to LMH DCVSh hardware
block.

Change-Id: I15258a8afea51421bc39d554ec96e2134924a3a6
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
2017-01-12 23:08:57 +05:30
Manaf Meethalavalappu Pallikunhi
2468799b76 ARM: dts: msm: Enable LMH DCVSh driver for sdm660
Enable LMH DCVSh driver for sdm660. It adds information about
the interrupt generated by the LMH DCVSh block for sdm660.

Change-Id: I6cd07ef4825aaa57cf3d58ea239c9fbc05c4e442
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
2017-01-12 23:08:41 +05:30
Amit Nischal
a7602b3f5f clk: qcom: Fix for rate request to RPM during handoff
For all rpm clocks, max rate request is going to RPM
during handoff which always shows max requested rate
value from APSS so fix the same.

Change-Id: I4f184ea053fc1a40830eb9f555c24fdf17ba3fa1
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2017-01-12 19:29:17 +05:30
Brahmaji K
6ae743ace4 ARM: dts: msm: Fix configurations for crypto and qrng on SDM660
Update qrng block address and interrupt number for crypto hardware
for SDM660.

Change-Id: I5f0066a1d2086830747156d8c65746a2dac87feb
Signed-off-by: Brahmaji K <bkomma@codeaurora.org>
2017-01-12 16:48:50 +05:30
Amey Telawane
9eead8eab4 ARM: dts: msm: enable watchdog for sdm 660
Enable watchdog node for sdm660 which is
used to detect system hang.

Change-Id: I463f7320a068b678370b295558689c37d8073fb7
CRs-fixed: 1056777
Signed-off-by: Amey Telawane <ameyt@codeaurora.org>
2017-01-12 16:03:49 +05:30
Lingutla Chandrasekhar
4d5af64346 power: reset: fix compilation errors when dload disabled.
If download mode disabled, msm-poweroff driver compilation will
throw errors.
Fix them by moving download mode support under the flag.

Change-Id: I7a3f946d72cb4e500e3e762e4a6a5f2c8b90cb8c
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-01-12 15:25:45 +05:30
Shrey Vijay
b079057511 ARM: dts: msm: Add I2C, SPI, UART and slimbus devices for SDM630
Add device nodes for I2C, SPI, UART and also Audio and QCA slimbus
which are disabled by default. Need to enable along with slave instances.

Change-Id: I8e9486b6774a993c14c1363adaa62435e8c0d58b
Signed-off-by: Shrey Vijay <shreyv@codeaurora.org>
2017-01-12 14:06:33 +05:30
Amit Nischal
4e98c1b61a clk: qcom: Add support to set rcg parent src for dp_pixel clock
For set rate, dp_pixel_clk_src rcg requires the correct parent
source to configured so add support for the same.

Change-Id: I9c8ae2904b47dbe0bc6845e2ca38fbd2f126a7e5
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2017-01-12 12:17:09 +05:30
Vijayavardhan Vennapusa
e905710b39 ARM: dts: msm: Use correct property name to pass values for sdm660
Use correct property name for passing voltage values for voting
core_ldo which is required for QMP PHY.

Change-Id: I042905f5971c653f580a6f4388555744ff3160cc
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-01-12 11:52:30 +05:30
Sayali Lokhande
b1774a44b6 ARM: dts: msm: Update voltage and interrupt details of sdhc2 for sdm660
Update vdd-current-level as per latest hardware documentation
and interrupt related properties of sdhc2 for sdm660.

Change-Id: I93fa440bc7ae0f72cb19949fdb9e4c5f6322d253
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-01-12 09:12:22 +05:30
Pavankumar Kondeti
f6471c2c9d sched: Fix compilation errors when CFS_BANDWIDTH && !SCHED_HMP
There are few compiler errors and warnings when CFS_BANDWIDTH
config is enabled but not SCHED_HMP.

Change-Id: Idaf4a7364564b6faf56df2eb3a1a74eeb242d57e
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2017-01-12 08:43:45 +05:30
Pavankumar Kondeti
f1a15235d6 sched: fix compiler errors with !SCHED_HMP
HMP scheduler boost feature related functions are referred in SMP
load balancer. Add the nop functions for the same to fix the
compiler errors with !SCHED_HMP.

Change-Id: I1cbcf67f728c2cbc7c0f47e8eaf1f4165649dce8
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2017-01-12 08:43:45 +05:30
Yahui Wang
f704577710 ARM: dts: msm: add PMI GPIO1 to control WLED for msm8998 QVR
PMI GPIO1 is used to enable and disable WLED for msm8998 QVR,
we should also invert the gpio level according to HW design.

CRs-Fixed: 1101647
Change-Id: If29e41d12a697d7fd6671f1134a1e798c80c3523
Signed-off-by: Yahui Wang <yahuiw@codeaurora.org>
2017-01-12 09:42:55 +08:00
Sathish Ambley
e83e4c14e9 msm: ADSPRPC: attributes to support per-buffer coherent mappings
Added attributes for forcing a buffer mapped as coherent or
non-coherent by using the DMA_ATTR_FORCE_COHERENT and
DMA_ATTR_FORCE_NON_COHERENT.

Change-Id: Ifecad81dd96b99ab63854bddce378ff775c22d38
Acked-by: Viswanatham Paduchuri <vpaduchu@qti.qualcomm.com>
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
2017-01-11 16:10:30 -08:00
Hemant Kumar
7fb09bc807 Revert "USB: rndis: Free the rndis response queue during rndis reset msg"
This reverts commit c996cdd384 ("USB: rndis:
Free the rndis response queue during REMOTE_NDIS_RESET_MSG"). RNDIS host
sends GET_ENCAP_RESP for every RESP_AVAILABLE_NOTIFICATION from device.
As result if REMOTE_NDIS_RESET_MSG comes device rndis driver frees all the
previous responses and once notify request gets completed for previous
RNDIS request message it sends reset message completion resonse. When
response available request corresponding to RNDIS reset message gets
completed host RNDIS driver sends GET_ENCAP_RESP and device sends stall
because all RNDIS responses are freed due to RNDIS reset message.

Change-Id: I8a785d1ea8175c5c6aa08cda5cdd00cfd0c561b5
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2017-01-11 15:15:38 -08:00
Sameer Thalappil
cad60c3513 cfg80211: Reset beacon interval when stop AP fails
When SSR happens at WLAN driver, the cfg80211 stop AP can fail at driver.
Make sure that the beacon interval is reset, even when this API fails.

Change-Id: I459f55ce5f4bc44c4d0e20170bd50a83c2d609b4
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
CRs-fixed: 1078172
2017-01-11 14:22:56 -08:00
ahmedsh
9a71e9a686 seemp: use local stack mem when encoding params
Avoid race condition in driver when encoding param by
reading contents from a local copy instead of msg buffer
itself which can be mapped to user space.

Change-Id: I405ca6c7fcb0afa112e0851907b5dca805ac5411
Signed-off-by: Ahmed Sheikh <ahmedsh@codeaurora.org>
2017-01-11 11:22:57 -08:00
Benjamin Chan
e43aa01402 msm: sde: Reduce SDE rotator done signaling time
When rotator job finished, driver needs to send out done signaling to
notify fbdev driver to perform a commit. However, there are occasions
that the SMMU disabling take quite long time and delaying the fbdev
commit time. To reduce this unpredict latency, move the SMMU disabling
much later in the rotator done handling, and also remove unnecessary
SMMU disabling call during commit phase.

CRs-Fixed: 1100633
Change-Id: I76ad017661aa6f760a2adc3579f59a7b66ab8e40
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2017-01-11 11:03:23 -05:00
Udaya Bhaskara Reddy Mallavarapu
ff70aa66a8 defconfig: msm: enable dvb demux modules compilation
Enable dvb_core, mpq demux plugin, TSPP modules compilation.

CRs-Fixed: 1108990
Change-Id: I330c64d0f27ed8c700814b0333e40ee005435594
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
2017-01-11 21:28:03 +05:30
Gaurav Singhal
94594358b9 NFC: Fix interrupt state in recovery
If read function is waiting for interrupt and after that
NFCC goes to recovery, MW will call ioctl (0) and ioctl (1),
In ioctl (0) call we are disabling interrupt so read function
was waiting for interrupt and ioctl call has disabled interrupt,
now there is no possibility interrupt will be enabled again
because only read function enables the interrupt.

Enabled interrupt in ioctl (1) so that we can receive data
after reset/recovery.

Change-Id: I1677a50129534b1eaa4b8c20820a15db299cd9c1
Signed-off-by: Gaurav Singhal <gsinghal@codeaurora.org>
2017-01-11 17:33:25 +05:30
Tirupathi Reddy
cd997caa00 regulator: cpr3: fix system regulator vote in regulator disable path
Vote minimum possible voltage corner on system regulator in
regulator disable path when the CPR controller manages an
underlying LDO of type LDO300.

Also, fix the regulator get failure print when vdd-supply
not specified for CPRh controllers.

CRs-Fixed: 1108988
Change-Id: Ic1c7b6fd4bf93dd213b2f639aa21b47890906478
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-01-11 14:16:35 +05:30
Benjamin Chan
6e6fc49179 msm: sde: Fix variable initialization in SDE rotator
Properly initialize local variable in the SDE rotator WB done handler.
Under error condition, it is possible that the handler access the
uninitialized variable.

CRs-Fixed: 1110015
Change-Id: I4c76fd6400c528f5dd7773aa9b3718dd86b2b01a
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2017-01-11 02:51:13 -05:00
Mao Jinlong
56a6f88a34 input: qpnp-power-on: set boot_reason when system-reset exists
Some platforms don't configure qcom,secondary-pon-reset like 8998.
So set boot_reason when "qcom,system-reset" node exists to avoid
setting a wrong value to boot_reason.

CRs-Fixed: 1102732
Change-Id: I9e9ff2f2d0ffac6baa5d0663664001eb30638e87
Signed-off-by: Mao Jinlong <c_jmao@codeaurora.org>
2017-01-11 15:45:49 +08:00
Utkarsh Saxena
e1131a815f msm: ipa: AP+STA statistics support for IPAv2 driver
Add IPA stats support on AP+STA mode for V2 driver
when CNE queries. Also add metering funtionality
on WIFI interface to stop the data transfer
when quota reached on WIFI-case.

Change-Id: I51a771423e6a35ea0453b978be484d0464bddf14
Acked-by: Chaitanya Pratapa <cpratapa@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
2017-01-11 13:02:10 +05:30
Ritesh Harjani
b93aab4d22 mmc: mmc: Don't send CMD13 after switch command while switching speed modes
Do not send CMD13 after sending switch command for HS, HS_DDR,
HS200 and HS400 modes. It seems that below problem can occur -
1. After sending switch CMD6, card will switch to mentioned bus speed
mode.
2. At this moment the controller will be in different bus speed mode,
unless the timing of the controller is switched to match with that of
card.

During this time, if CMD13 follows CMD6 to switch the bus speed
mode in card. Then it may cause timeouts or other errors because
of mismatch in timing of controller and card.

Thus send CMD13 to see the status once both controller and card are
switched to same timings.

Change-Id: If796c8cfce2cbdc1bce460460e3276886ae1be0c
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-01-11 12:20:08 +05:30
Yahui Wang
1e19092380 ARM: dts: msm: enable display panel for sdm660 QRD
nt36850 wqhd command panel will be used for sdm660 QRD,
so enable it for sdm660 QRD.

CRs-Fixed: 1107352
Change-Id: Ia7a691949bfef8777f78e846b6fb92e01658441f
Signed-off-by: Yahui Wang <yahuiw@codeaurora.org>
2017-01-11 09:51:50 +08:00
Runmin Wang
5d18545892 ARM: dts: msm: Add TLB dump entries for msm8998
Add TLB dump entries to setup memory space for the cpuss dump
driver to dump TLB entries.

Change-Id: I7514969c1540d18d2102088b43d959adec68152f
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-01-10 14:41:51 -08:00
John Dias
5145fb9b00 perf: don't leave group_entry on sibling list (use-after-free)
When perf_group_detach is called on a group leader,
it should empty its sibling list. Otherwise, when
a sibling is later deallocated, list_del_event()
removes the sibling's group_entry from its current
list, which can be the now-deallocated group leader's
sibling list (use-after-free bug).

Bug: 32402548
Change-Id: I99f6bc97c8518df1cb0035814368012ba72ab1f1
Signed-off-by: John Dias <joaodias@google.com>
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: 6b6cfb2362f09553b46b3b7e5684b16b6e53e373
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-01-10 14:18:20 -08:00
David Howells
7e5d3e2def KEYS: Fix short sprintf buffer in /proc/keys show function
This fixes CVE-2016-7042.

Fix a short sprintf buffer in proc_keys_show().  If the gcc stack protector
is turned on, this can cause a panic due to stack corruption.

The problem is that xbuf[] is not big enough to hold a 64-bit timeout
rendered as weeks:

	(gdb) p 0xffffffffffffffffULL/(60*60*24*7)
	$2 = 30500568904943

That's 14 chars plus NUL, not 11 chars plus NUL.

Expand the buffer to 16 chars.

I think the unpatched code apparently works if the stack-protector is not
enabled because on a 32-bit machine the buffer won't be overflowed and on a
64-bit machine there's a 64-bit aligned pointer at one side and an int that
isn't checked again on the other side.

The panic incurred looks something like:

Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: ffffffff81352ebe
CPU: 0 PID: 1692 Comm: reproducer Not tainted 4.7.2-201.fc24.x86_64 #1
Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011
 0000000000000086 00000000fbbd2679 ffff8800a044bc00 ffffffff813d941f
 ffffffff81a28d58 ffff8800a044bc98 ffff8800a044bc88 ffffffff811b2cb6
 ffff880000000010 ffff8800a044bc98 ffff8800a044bc30 00000000fbbd2679
Call Trace:
 [<ffffffff813d941f>] dump_stack+0x63/0x84
 [<ffffffff811b2cb6>] panic+0xde/0x22a
 [<ffffffff81352ebe>] ? proc_keys_show+0x3ce/0x3d0
 [<ffffffff8109f7f9>] __stack_chk_fail+0x19/0x30
 [<ffffffff81352ebe>] proc_keys_show+0x3ce/0x3d0
 [<ffffffff81350410>] ? key_validate+0x50/0x50
 [<ffffffff8134db30>] ? key_default_cmp+0x20/0x20
 [<ffffffff8126b31c>] seq_read+0x2cc/0x390
 [<ffffffff812b6b12>] proc_reg_read+0x42/0x70
 [<ffffffff81244fc7>] __vfs_read+0x37/0x150
 [<ffffffff81357020>] ? security_file_permission+0xa0/0xc0
 [<ffffffff81246156>] vfs_read+0x96/0x130
 [<ffffffff81247635>] SyS_read+0x55/0xc0
 [<ffffffff817eb872>] entry_SYSCALL_64_fastpath+0x1a/0xa4

Change-Id: I23554b54eb9b82f44554a3ef620200de9f6ea55a
Reported-by: Ondrej Kozina <okozina@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Ondrej Kozina <okozina@redhat.com>
cc: stable@vger.kernel.org
Signed-off-by: James Morris <james.l.morris@oracle.com>
Git-repo: http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git
Git-commit: 03dab869b7b239c4e013ec82aea22e181e441cfc
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-01-10 14:14:57 -08:00
Daniel Rosenberg
c7adff7a0c ion: Fix use after free during ION_IOC_ALLOC
If a user happens to call ION_IOC_FREE during an
ION_IOC_ALLOC on the just allocated id, and the
copy_to_user fails, the cleanup code will attempt
to free an already freed handle.

This adds a wrapper for ion_alloc that adds an
ion_handle_get to avoid this.

Bug: 31568617
Change-Id: I476e5bd5372b5178a213f1fea143d270cf9361ed
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Git-repo: https://android.googlesource.com/kernel/msm/
Git-commit: 20a5411d0115b16826f3d327b6abb0192c8a2001
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-01-10 14:08:32 -08:00
Zhen Kong
0963c07e9f qseecom: fix potential memory leak in __qseecom_update_cmd_buf_64
__qseecom_update_cmd_buf_64() called __qseecom_allocate_sg_list_buffer()
to allocate memory from within a for loop. Should it fail on any other
than the first time through the loop, the prior allocations will not be
deallocated, make change to deallocate memory in this error case.

Change-Id: I8cb71a3b141249d8266aec4890632f200d147405
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2017-01-10 13:14:10 -08:00
Linux Build Service Account
2dc96b1cbb Merge "msm: camera: fd: Call fd buffer done on active buffer" 2017-01-10 12:27:11 -08:00
Linux Build Service Account
9c82f6cac8 Merge "drm/msm/dsi-staging: add dsi definitions for new dsi driver" 2017-01-10 12:27:10 -08:00
Linux Build Service Account
86a4156c95 Merge "ASoC: msm8996: Fix kernel crash in "Speaker Function" mixer control" 2017-01-10 12:27:10 -08:00
Linux Build Service Account
3d66b34e70 Merge "ARM: dts: msm: add audio support for sdm660 qrd skus" 2017-01-10 12:27:09 -08:00