Commit graph

578167 commits

Author SHA1 Message Date
Linux Build Service Account
b23cd82dba Merge "soc: qcom: msm_bus: Set current index to default value" 2016-11-25 17:47:07 -08:00
Linux Build Service Account
0ff0bddebd Merge "ARM: dts: msm: Add thermal mitigation properties to msmfalcon" 2016-11-25 17:47:06 -08:00
Linux Build Service Account
74d0e8e4ca Merge "input: synaptics_dsx: add checks of user input data" 2016-11-25 17:47:04 -08:00
Linux Build Service Account
fdc9a3b7d5 Merge "ASoC: wcd9335: Add dapm ignore suspend for codec dai" 2016-11-25 17:47:03 -08:00
Linux Build Service Account
ef8f297dee Merge "ASoc: msm: qdsp6v2: Add support for compress capture" 2016-11-25 17:47:02 -08:00
Linux Build Service Account
308d5348fe Merge "include: clock: Add audio external clock of_index extries" 2016-11-25 17:47:01 -08:00
Linux Build Service Account
6392d4ee36 Merge "msm: mdss: fix to handle multi-rect configuration in error cases" 2016-11-25 17:46:59 -08:00
Linux Build Service Account
4df93480e8 Merge "msm: crypto: fix issues on digest buf and copy_from_user in qcedev.c" 2016-11-25 17:46:58 -08:00
Linux Build Service Account
2eeb169184 Merge "Revert "msm: kgsl: Enable limits management on A540v2"" 2016-11-25 17:46:57 -08:00
Linux Build Service Account
2d8b206407 Merge "smb-lib: fix null ptr access while handling src change interrupt" 2016-11-25 17:46:56 -08:00
Linux Build Service Account
c7690d6901 Merge "msm: mdss: refine the calculation of tmds clock rate" 2016-11-25 17:46:54 -08:00
Linux Build Service Account
86dffc4e82 Merge "msm: camera: Enable secure camera feature" 2016-11-25 17:46:53 -08:00
Linux Build Service Account
0ed6e29b91 Merge "soc: qcom: socinfo: Change offset of image OEM attribute" 2016-11-25 17:46:52 -08:00
Linux Build Service Account
1095ce72f4 Merge "qpnp-smb2: force UFP mode before shutdown" 2016-11-25 17:46:51 -08:00
Linux Build Service Account
24f3e90971 Merge "qpnp-smb2: add support to configure auto recharge" 2016-11-25 17:46:50 -08:00
Linux Build Service Account
2488b7eb05 Merge "qcom: scm: remove printing input arguments" 2016-11-25 08:32:36 -08:00
Linux Build Service Account
22f8318fcc Merge "audit: fix a double fetch in audit_log_single_execve_arg()" 2016-11-25 08:32:35 -08:00
Swetha Chikkaboraiah
394c5c6ca0 qcom: scm: remove printing input arguments
scm_call2 is printing the input arguments if TZ ret value is  < 0
leading to information leak. Remove printing input arguments.

Change-Id: I21dd6d83fa979aed2c79ebb2c9c8de63a247dded
CRs-Fixed: 1076407
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
Signed-off-by: Paresh Purabhiya <ppurab@codeaurora.org>
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2016-11-25 04:10:25 -08:00
Linux Build Service Account
9a20006c20 Merge "soc: qcom: fix uninitialized references in gladiator_erp_v2" 2016-11-25 00:10:26 -08:00
Linux Build Service Account
c03c511346 Merge "ARM: dts: msm: Add support of IPA for falcon" 2016-11-25 00:10:25 -08:00
Linux Build Service Account
bee274711e Merge "clk: qcom: Add snapshot of OSM CPU clock driver" 2016-11-24 13:46:42 -08:00
Linux Build Service Account
00bfc5fe15 Merge "ARM: dts: msm: Add RTB support for msmtriton" 2016-11-24 13:46:38 -08:00
Linux Build Service Account
97679b802a Merge "ARM: dts: msm: Add mpm2-sleep-counter device for msmtriton" 2016-11-24 13:46:37 -08:00
Linux Build Service Account
2488cd08b4 Merge "arm: qcom: correct description for MSMTRITON and MSMFALCON" 2016-11-24 13:46:36 -08:00
Linux Build Service Account
a9a8ec4cae Merge "msm: vidc: parse 10-bit bus entries for msmfalcon" 2016-11-24 06:13:39 -08:00
Linux Build Service Account
baccd73792 Merge "ARM: dts: msm: Add venus device nodes for starlord" 2016-11-24 06:13:38 -08:00
Linux Build Service Account
c17ad2a8a7 Merge "msm: vidc: Update mbs per second calculation" 2016-11-24 06:13:36 -08:00
Linux Build Service Account
4edc6e2899 Merge "msm: vidc: fix mutex lock issue" 2016-11-24 06:13:35 -08:00
Linux Build Service Account
8c41e4e6b1 Merge "msm: vidc: fix the interrupt miss issue from video hardware" 2016-11-24 06:13:34 -08:00
Linux Build Service Account
383d1c1542 Merge "msm: kgsl: Add support for A512 GPU" 2016-11-24 06:13:33 -08:00
Linux Build Service Account
8a70f4e5d7 Merge "ASoC: msm: Update supported sample rates for USB Backend" 2016-11-24 06:13:32 -08:00
Linux Build Service Account
d2f94a9a44 Merge "netfilter: nfnetlink: correctly validate length of batch messages" 2016-11-24 06:13:31 -08:00
Linux Build Service Account
e49d49a3ec Merge "USB: gagget: f_fs: Return error if TX req is queued during device offline" 2016-11-24 06:13:30 -08:00
Linux Build Service Account
e9ccaa5b66 Merge "clk: qcom: Add support for rf clk1 for msmfalcon" 2016-11-24 06:13:29 -08:00
Linux Build Service Account
11c49a900c Merge "ARM: dts: msm: Update clock gfx node for MSMfalcon/Triton" 2016-11-24 06:13:27 -08:00
Linux Build Service Account
57f5019a62 Merge "clk: qcom: Add support for MMCC clock for MSMFalcon" 2016-11-24 06:13:26 -08:00
Linux Build Service Account
0e7a3bb0e4 Merge "cgroup: prefer %pK to %p" 2016-11-24 06:13:25 -08:00
Linux Build Service Account
a2f553518d Merge "HID: core: prevent out-of-bound readings" 2016-11-24 06:13:24 -08:00
Linux Build Service Account
f3e00aadcd Merge "[media] xc2028: avoid use after free" 2016-11-24 06:13:22 -08:00
Linux Build Service Account
065421c6fa Merge "tcp: fix use after free in tcp_xmit_retransmit_queue()" 2016-11-24 06:13:22 -08:00
Linux Build Service Account
091685a6a4 Merge "block: fix use-after-free in sys_ioprio_get()" 2016-11-24 06:13:20 -08:00
Linux Build Service Account
aff86d3b4f Merge "cfg80211: validate beacon int as part of iface combinations" 2016-11-24 06:13:18 -08:00
Linux Build Service Account
2fb4ab87aa Merge "cfg80211: fix beacon interval in interface combination iteration" 2016-11-24 06:13:18 -08:00
Linux Build Service Account
7193fef2dc Merge "cfg80211: identically validate beacon interval for AP/MESH/IBSS" 2016-11-24 06:13:17 -08:00
Linux Build Service Account
c82d43b7d9 Merge "msm: sde: Correct max downscale factor for SDE rotator" 2016-11-24 06:13:16 -08:00
Paul Moore
7b0a354c5e audit: fix a double fetch in audit_log_single_execve_arg()
There is a double fetch problem in audit_log_single_execve_arg()
where we first check the execve(2) argumnets for any "bad" characters
which would require hex encoding and then re-fetch the arguments for
logging in the audit record[1].  Of course this leaves a window of
opportunity for an unsavory application to munge with the data.

This patch reworks things by only fetching the argument data once[2]
into a buffer where it is scanned and logged into the audit
records(s).  In addition to fixing the double fetch, this patch
improves on the original code in a few other ways: better handling
of large arguments which require encoding, stricter record length
checking, and some performance improvements (completely unverified,
but we got rid of some strlen() calls, that's got to be a good
thing).

As part of the development of this patch, I've also created a basic
regression test for the audit-testsuite, the test can be tracked on
GitHub at the following link:

 * https://github.com/linux-audit/audit-testsuite/issues/25

[1] If you pay careful attention, there is actually a triple fetch
problem due to a strnlen_user() call at the top of the function.

[2] This is a tiny white lie, we do make a call to strnlen_user()
prior to fetching the argument data.  I don't like it, but due to the
way the audit record is structured we really have no choice unless we
copy the entire argument at once (which would require a rather
wasteful allocation).  The good news is that with this patch the
kernel no longer relies on this strnlen_user() value for anything
beyond recording it in the log, we also update it with a trustworthy
value whenever possible.

Reported-by: Pengfei Wang <wpengfeinudt@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Change-Id: Ie9848961d236739df5014474f2c2a781af9fb811
Git-repo: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Git-commit: 43761473c254b45883a64441dd0bc85a42f3645c
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2016-11-23 11:33:07 -08:00
Kyle Yan
51ab99448d Merge rel/msm-4.4 on remote branch
Change-Id: Id919aee14aa3898b8168015a3ae310437d604812
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
2016-11-23 11:04:58 -08:00
Manaf Meethalavalappu Pallikunhi
ad267f4ba1 ARM: dts: msm: Add thermal mitigation properties to msmfalcon
Add thermal properties to enable kernel thermal monitoring and
mitigations like hotplug, thermal reset, vdd restriction, etc.
for msmfalcon. Add mitigation profiles for each physical CPU which
has information like sensor to monitor and various mitigation types
to enable for msmfalcon.

Change-Id: I36ca125143cf9929fb0bd781990bdd8ab1dbeebf
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
2016-11-23 04:17:30 -08:00
Manaf Meethalavalappu Pallikunhi
d1dfa5145a ARM: dts: msm: Add thermal sensor info for msmfalcon
Add thermal sensor related information, which provides information
such as alias, type and scaling factor to Kernel Thermal Monitor(KTM).
The KTM exposes these sensor information via sysfs to thermal-engine.

Change-Id: Ie564c181db61f6229479a49917cdb9e6c1887fc5
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
2016-11-23 04:17:16 -08:00
Min Chong
93ae6efaf8 input: synaptics_dsx: add checks of user input data
Add checks of the user input count to avoid possible heap overflow

Signed-off-by: Min Chong <mchong@google.com>
Bug: 30937462
Git-repo: https://android.googlesource.com/kernel/msm.git
Git-commit: a6accafb252a76256f11c83e28c556c8ca4b8e1f
Change-Id: I6fc8323cbcf395a2c24e49e65cc7012709d031a2
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2016-11-23 03:27:01 -08:00