Commit graph

600476 commits

Author SHA1 Message Date
Linux Build Service Account
e5020c2024 Merge "net: core: null pointer derefernce in sockev_client_cb" 2018-07-12 20:13:12 -07:00
Linux Build Service Account
348619f43f Merge "usb: gadget: ffs: Remove IPC context create failure log" 2018-07-12 05:37:43 -07:00
Linux Build Service Account
c236da24a2 Merge "msm: camera: isp: Add null check for vfe_dev." 2018-07-12 05:37:32 -07:00
Linux Build Service Account
dad1ae12b3 Merge "cnss2: Do not load board data file if bdf_bypass is enabled" 2018-07-12 05:37:14 -07:00
Linux Build Service Account
926778dc85 Merge "iommu/debug: Add mutex to make attach/detach thread safe" 2018-07-12 05:36:59 -07:00
Shobhit Singh
29b44c2034 msm: camera: isp: Add null check for vfe_dev.
In some cases, observed that vfe node information is
not filled in the stream information, this will lead
to a null pointer access. To avoid such scenarios,
a null check is added.

Change-Id: Ibe8e095629574e2d8b8fbb097449d49bc0a762b3
Signed-off-by: Shobhit Singh <shobsi@codeaurora.org>
2018-07-11 22:17:46 -07:00
Yue Ma
e84e34c011 cnss2: Do not load board data file if bdf_bypass is enabled
Send dummy board data file to firmware if bdf_bypass is enabled,
no matter the real file is present or not.

Change-Id: I042d0ce7190fa56f362baf99c5847edf50419377
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2018-07-11 18:40:24 -07:00
Linux Build Service Account
74891ac5bf Merge "msm: adsprpc: destroy mutex before file free" 2018-07-11 15:18:40 -07:00
Linux Build Service Account
cd536e63e3 Merge "net: sockev: code cleanup" 2018-07-11 07:09:25 -07:00
Linux Build Service Account
37c280a3b7 Merge "xhci: Fix use-after-free in xhci_free_virt_device" 2018-07-11 07:09:24 -07:00
Linux Build Service Account
af27a0fe41 Merge "ufs: scsi: fix redzone overwritten error when print utp hci testbus" 2018-07-11 07:09:23 -07:00
Linux Build Service Account
324c1ad8e8 Merge "usb: dwc3-msm: Enable PHY IRQ wakeup only for non-auto targets" 2018-07-11 07:09:22 -07:00
Linux Build Service Account
52d99c3422 Merge "clk: msm: clock-mmss-8996: disable cache based clk rate" 2018-07-11 07:09:21 -07:00
Tharun Kumar Merugu
c2eebf8cdf msm: adsprpc: destroy mutex before file free
Destroy mutex before file free, to avoid use after free of mutex.

Change-Id: I4ff73dc17b15043eacbb299219a379bfd1a8efa6
Acked-by: Himateja Reddy <hmreddy@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2018-07-11 15:20:08 +05:30
Tejaswi Tanikella
074c25bf9f net: core: null pointer derefernce in sockev_client_cb
sockev_client_cb creates a netlink message and populates
the nlmsg_data using the socket->sock information.
If socket is closed, while the nlmsg_data is being
populated, a null pointer dereference occurs.

BUG: KASAN: null-ptr-deref in sockev_client_cb+0x1e4/0x310 net/core/sockev_nlmcast.c:98
Read of size 2 at addr 0000000000000010 by task syz-executor/9398
CPU: 6 PID: 9398 Comm: syz-executor Tainted: G W O 4.9.92+ #1

Call trace:
[<ffffff94e2bebec4>] sockev_client_cb+0x1e4/0x310 net/core/sockev_nlmcast.c:98
[<ffffff94e14fb20c>] notifier_call_chain+0x94/0xe0 kernel/notifier.c:93
[<ffffff94e14fb894>] __blocking_notifier_call_chain+0x6c/0xb8 kernel/notifier.c:317
[<ffffff94e14fb920>] blocking_notifier_call_chain+0x40/0x50 kernel/notifier.c:328
[<ffffff94e2b727f8>] sockev_notify net/socket.c:180 [inline]
[<ffffff94e2b727f8>] SYSC_listen net/socket.c:1446 [inline]
[<ffffff94e2b727f8>] SyS_listen+0x1e0/0x1f8 net/socket.c:1428
[<ffffff94e1483f70>] el0_svc_naked+0x24/0x28

CR's Fixed: 2251042
Change-Id: Iad9eb58cd05fcdc0b5cc1ed24de56b69abb532b4
Signed-off-by: Sharath Chandra Vurukala <sharathv@codeaurora.org>
Signed-off-by: Tejaswi Tanikella <tejaswit@codeaurora.org>
2018-07-11 14:46:19 +05:30
Tejaswi Tanikella
31c5d9be72 net: sockev: code cleanup
Replace with cleaner NULL checks. Needed for dependent change
commit 59f6fd5f1905 ("net: core: null pointer derefernce in
		sockev_client_cb").

Change-Id: Icdd7a5c9f3e3f343bb20b1f9b75fa580ea75a2dc
Signed-off-by: Tejaswi Tanikella <tejaswit@codeaurora.org>
2018-07-11 14:45:57 +05:30
Can Guo
11282791fe ufs: scsi: fix redzone overwritten error when print utp hci testbus
When print UTP HCI testbus data, a redzone overwritten error is triggered
because the max select minor value goes across its border. This change
fixes it.

Change-Id: Ib085288f3770aa0ab3683926247fb95f5e50cb08
Signed-off-by: Can Guo <cang@codeaurora.org>
2018-07-11 16:11:55 +08:00
Linux Build Service Account
4049db73f1 Merge "Merge android-4.4.139 (7ba5557) into msm-4.4" 2018-07-10 22:43:57 -07:00
Linux Build Service Account
62b5f32c45 Merge "ASoC: msm: Fix config control indices for TX DAIs" 2018-07-10 22:43:53 -07:00
Linux Build Service Account
8b6c671074 Merge "include: qdsp6v2: avoid returning error code from stubbed function" 2018-07-10 22:43:49 -07:00
Linux Build Service Account
a37cd25c94 Merge "Revert "drm/msm/sde: output black frame during resume operation"" 2018-07-10 08:50:42 -07:00
Linux Build Service Account
505d3dc6f5 Merge "mdss: mdp: Constant fetch start across dfps change" 2018-07-10 08:50:39 -07:00
Linux Build Service Account
6f512dfbfc Merge "DRM: DSI: setup software context during DSI prepare with splash" 2018-07-10 08:50:35 -07:00
Satish Babu Patakokila
595690c416 ASoC: msm: Fix config control indices for TX DAIs
Correct the config control indices for TX DAIs of MI2S interface.

Change-Id: Ie8bf646a0c1fbd30abdb34703ae1f90ed9b484e8
Signed-off-by: Satish Babu Patakokila <sbpata@codeaurora.org>
2018-07-10 03:50:13 -07:00
Ajay Agarwal
07cc3a041e usb: dwc3-msm: Enable PHY IRQ wakeup only for non-auto targets
On automotive targets, we do not want the system to wakeup if the
connected peripheral is issuing remote wakeup when the system is
PM suspended. Do not enable the system wakeup capability of the
PHY IRQs if the target is automotive.

Change-Id: I0bd986fdfab8f978692b605a44301086de3d0a87
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-07-10 15:43:33 +05:30
Linux Build Service Account
25da117eca Merge "usb: misc: Fix incorrect use of keywords in Kconfig" 2018-07-10 00:19:32 -07:00
Linux Build Service Account
f632f91c79 Merge "scsi: ufs: print TSTBUS_UTP_HCI testbus data" 2018-07-10 00:19:31 -07:00
Banajit Goswami
c719e9e28e include: qdsp6v2: avoid returning error code from stubbed function
If MSM_QDSP6_NOTIFIER is not enabled for a target, audio_notifier
feature will not be available for that target. Whenever a call is
made to audio_notifier when its not supported, returning error from
stubbed function may confuse the error with real failure (even though
the feature is not enabled on the target). Avoid returning error code
from stubbed function, when feature is disabled.

Change-Id: I37eb2e25e45b25948aff55f2a231195a22b16f05
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
2018-07-09 21:37:57 -07:00
Linux Build Service Account
093e11e9d2 Merge "sdm660: defconfig: Enable GCM crypto configs" 2018-07-09 12:30:23 -07:00
Linux Build Service Account
792f7097d5 Merge "hid: usbhid: Changes to prevent buffer overflow" 2018-07-09 12:30:22 -07:00
Vivek Gautam
580b853d73 iommu/debug: Add mutex to make attach/detach thread safe
This mutex lock will help to synchronise the usage of iommu domain
structure which is getting used by multiple threads to perform
iommu attach and iommu detach in case of any error.

Without this change we are seeing page poisoning - write after free
when running stress tests using iommu-debug test cases.

Change-Id: I1033808a510786577c41201c2a6a330e5465d4d1
Acked-by: Ankur Saxena <c_ankusa@qti.qualcomm.com>
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
2018-07-09 23:36:34 +05:30
Linux Build Service Account
78366da7ed Merge "msm8998: defconfig: Enable GCM crypto configs." 2018-07-09 03:59:41 -07:00
Linux Build Service Account
cabe796714 Merge "ASoC: msm: qdsp6v2: Update LSM param hdr size" 2018-07-09 03:59:40 -07:00
Linux Build Service Account
055c0ed6a2 Merge "pmic: gpio: dt: disable unnecessary gpios in la-gvm" 2018-07-09 03:59:38 -07:00
Gerrit - the friendly Code Review server
83ddc388e2 Merge changes into msm-4.4 2018-07-09 03:35:34 -07:00
Animesh Kishore
6ab8fbb872 mdss: mdp: Constant fetch start across dfps change
Timing engine HW restricts changing programmable fetch
start when off. Fix fetch start in SW drivers.

Change-Id: I8ec80408a4ae36a7dfd963bc570fca9672d12341
Signed-off-by: Animesh Kishore <animeshk@codeaurora.org>
2018-07-09 12:06:52 +05:30
Devi Sandeep Endluri V V
25b8a96a31 sdm660: defconfig: Enable GCM crypto configs
Enable GCM crypto support.

Change-Id: I08b9d20ad314117bb30b21ffc2eabe8dd0cac7d3
CRs-Fixed: 2263373
Signed-off-by: Devi Sandeep Endluri V V <dendluri@codeaurora.org>
2018-07-09 11:22:35 +05:30
Linux Build Service Account
0e811b3f2e Merge "msm: ais: sensor: Fix turning clocks off during suspend" 2018-07-08 20:23:57 -07:00
Devi Sandeep Endluri V V
f66a4162ed msm8998: defconfig: Enable GCM crypto configs.
Enable GCM crypto support.

CRs-Fixed: 2263373
Change-Id: Ic243892a71551e880ece90876c38bb08fd709b4b
Signed-off-by: Devi Sandeep Endluri V V <dendluri@codeaurora.org>
2018-07-09 00:32:34 +05:30
Ajay Agarwal
d0631ff756 usb: misc: Fix incorrect use of keywords in Kconfig
In 'commit 60de9d752e ("usb: misc: Add snapshot of diag_bridge
driver")', we used wrong keyword in the Kconfig file. Fix that
by using "Qualcomm Technologies".

Change-Id: I6caecf19ed67257db7eda0289257118549d46836
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-07-07 14:38:30 +05:30
Linux Build Service Account
1708fcc68f Merge "ARM: dts: msm: add sde block lengths on msm8996" 2018-07-06 17:34:59 -07:00
Linux Build Service Account
726c573100 Merge "regulator: qpnp-lcdb: Disable the SC irq only for PM660L V1.1 and below" 2018-07-06 09:57:15 -07:00
Linux Build Service Account
eef8d2fd05 Merge "ARM: dts: msm: Set default status of I2C_8 as disabled" 2018-07-06 09:57:14 -07:00
Linux Build Service Account
f9c50487ba Merge "pinctrl: qcom: Clear status bit on irq_unmask" 2018-07-06 09:57:12 -07:00
Soumya Managoli
06cd2ea4b5 ASoC: msm: qdsp6v2: Update LSM param hdr size
q6lsm_pack_params requires param hdr size
to be filled and sent as argument.
Change is to update size with param_hdr_v3 struct size.

Change-Id: Id2380f3ceb887e1fc73b7f5f8e28ac93029082e4
Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2018-07-06 05:01:11 -07:00
Sriharsha Allenki
55fece3439 hid: usbhid: Changes to prevent buffer overflow
Moved some value checks to right positions to prevent
buffer flow, which may be possible before. Previously
these value checks are in an else statement which may
not be executed.

Change-Id: I02dbecd074183581a6bdae6377097bc004bd3d3c
CRs-fixed: 1102936
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
2018-07-06 16:22:02 +05:30
Linux Build Service Account
d429fdd458 Merge "Revert "do d_instantiate/unlock_new_inode combinations safely"" 2018-07-06 00:10:21 -07:00
Suprith Malligere Shankaregowda
c8e9459d37 msm: ais: sensor: Fix turning clocks off during suspend
Added condition check for suspend only if sensor state is power
down and for resume only if sensor state is power up in
pm functions on sensor driver to control.

Change-Id: Ia31f34dc103428423a86efe8f8012db18b5a75f1
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-07-05 23:54:27 -07:00
Srinivas Ramana
886e726260 pinctrl: qcom: Clear status bit on irq_unmask
This commits reverts the commit a6566710adaa ("pinctrl:
qcom: Don't clear status bit on irq_unmask").
Above change causes an unexpected wakeup on the gpios when the
interrupt is enabled. The gpio interrupt status bit is getting set
after the irq is disabled and causing an immediate interrupt after
enablling the irq. So, revert this change to avoid unexpected/spurious
wakeups.

The above change came in as part of the merge commit 3a75d7a947
("Merge 4.4.59 into android-4.4")

Change-Id: Ie58116c8ac5c81bc007d2c4398f5edfcbf9988d6
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-07-05 23:37:14 -07:00
Kiran Gunda
fadfa06fbf regulator: qpnp-lcdb: Disable the SC irq only for PM660L V1.1 and below
PM660L v2.0 has the NCP power-on issue fixed. This allows enabling the
short-circuit IRQ. Enable the same.

Change-Id: I4c0523ef8c46dd9bac190d4ad69190ef777ef14b
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2018-07-05 21:55:47 -07:00