Merge "dtc: add integer overflow checks in fdt header"
 SoC: msm: Add Buffer overflow check

The overflow check is required to ensure that user space data
in kernel may not go beyond buffer boundary.

CRs-Fixed: 563086
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
Signed-off-by: Mohammad Johny Shaik <mjshai@codeaurora.org>
(cherry picked from commit 7e09949355b2dac9aac8bb414037ccaca3c68d86)
Signed-off-by: Pavan Chikkala <pavanc@codeaurora.org>

Change-Id: I4da774740c71b97dc2e4fd16c78bf065ad457690
Signed-off-by: Pavan Chikkala <pavanc@codeaurora.org>
msm: HTC: m4: Don't map the entire heap into IOMMU

CAF only ever set these flags on 8960, and the HTC source I have here
doesn't do it either. As a bonus, the heap alignment is wrong for this
usecase, so it worked largely by chance.

Change-Id: Id96611ba6037486b1b78da60c4d144606eabc55b
msm: HTC: m4: Fix typo in qseecom bus scaling data

Lifted from c00d25c20c in CAF.

Change-Id: I491c494d1525c671884d27ed8f083c98f048f5da
msm: HTC: m7: Enable idletimer

Change-Id: I28ae35543376c0de2c1325b1e3810b8091d2b566
msm: HTC: t6: Enable idletimer

Change-Id: I18e6a7a8ad282dad0002bc85676a2c1f32579417
Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.7' into cm-12.0

Conflicts:
	drivers/misc/qseecom.c
	fs/proc/task_mmu.c
	include/net/tcp.h
	net/ipv4/syncookies.c
	net/ipv6/route.c
	net/ipv6/tcp_ipv6.c

Change-Id: I8a953e9f483a24ee45f5e1c570b6a4f92e87c6e9
Add PR_{GET,SET}_NO_NEW_PRIVS to prevent execve from granting privs

With this change, calling
  prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)
disables privilege granting operations at execve-time.  For example, a
process will not be able to execute a setuid binary to change their uid
or gid if this bit is set.  The same is true for file capabilities.

Additionally, LSM_UNSAFE_NO_NEW_PRIVS is defined to ensure that
LSMs respect the requested behavior.

To determine if the NO_NEW_PRIVS bit is set, a task may call
  prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0);
It returns 1 if set and 0 if it is not set. If any of the arguments are
non-zero, it will return -1 and set errno to -EINVAL.
(PR_SET_NO_NEW_PRIVS behaves similarly.)

This functionality is desired for the proposed seccomp filter patch
series.  By using PR_SET_NO_NEW_PRIVS, it allows a task to modify the
system call behavior for itself and its child tasks without being
able to impact the behavior of a more privileged task.

Another potential use is making certain privileged operations
unprivileged.  For example, chroot may be considered "safe" if it cannot
affect privileged tasks.

Note, this patch causes execve to fail when PR_SET_NO_NEW_PRIVS is
set and AppArmor is in use.  It is fixed in a subsequent patch.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Will Drewry <wad@chromium.org>
Acked-by: Eric Paris <eparis@redhat.com>
Acked-by: Kees Cook <keescook@chromium.org>

Change-Id: I2159006d20daefe6add5adc47c22bdbcd7d79e3a
v18: updated change desc
v17: using new define values as per 3.4
Signed-off-by: James Morris <james.l.morris@oracle.com>
selinux: Report permissive mode in avc: denied messages.

We cannot presently tell from an avc: denied message whether access was in
fact denied or was allowed due to global or per-domain permissive mode.
Add a permissive= field to the avc message to reflect this information.

Change-Id: I0281c366d0815addd5b22b26d266a18a743c53f5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
msm: msm_fb: delete cabc/sre update timers on power down

Change-Id: I2b670e2bf225d54ee999ec43007d0abb998fcb1b
staging: prima: Merge caf/LA.AF.1.1_rb1.7

Merge "wlan: Ignore PNO indication if the channel is not valid for CC."
Merge "wlan: Handle TX queues timeout when deauth come during ADD STA REQ"
Merge "wlan: Added the gEnableDFSPnoChnlScan ini parameter"
Merge "wlan: Do DEL_STA if driver gets deauth during ADD_STA."
wlan: Added the gEnableDFSPnoChnlScan ini parameter
Merge "wlan: Minimizing the retry log for Re/Assoc Rsp frame."
Merge "wlan: Address kernel panic due to invalid memory access"
Merge "wlan: Assign callback to resume TX if secondary channel is changed."
Merge "wlan: validate the driver status during interface down"
wlan: Address kernel panic due to invalid memory access
wlan: Assign callback to resume TX if secondary channel is changed.
Merge "wlan: PMF: Fix to delete pmfSaQueryTimer during SubSystemRestart"
Merge "wlan: logpinprogress wrongly set during SSR"
Merge "wlan: Validate hdd context before processing an IOCTL."
Merge "wlan:Clear the wmmAcSetupImplicitQos work in case of implicit AC mechanism."
Merge "wlan: Avoid watchdog bark due to excessive logging"
Merge "wlan: Add check for adapter MAGIC to avoid crash in rx_packet_cbk"
Merge "wlan: wdi: wpal: ratelimit invalid register read"
wlan: Validate hdd context before processing an IOCTL.
wlan: Add check for adapter MAGIC to avoid crash in rx_packet_cbk
wlan:Clear the wmmAcSetupImplicitQos work in case of implicit
wlan: Avoid watchdog bark due to excessive logging
wlan: PMF: Fix to delete pmfSaQueryTimer during SubSystemRestart
wlan: logpinprogress wrongly set during SSR
wlan: wdi: wpal: ratelimit invalid register read

Change-Id: Iccb708042b5ba680b5338992a2393f081eadf70d
drivers: input: Add BMA250 ONLY G-sensor Driver

Signed-off-by: Brinly Taylor <uberlaggydarwin@gmail.com>

Change-Id: I3c71068c62e71387bfa520d23d8f9ae14709d58b
drivers: regulators: Add NCP6924 driver

Signed-off-by: Brinly Taylor <uberlaggydarwin@gmail.com>

Change-Id: Ic40fa230d94d16823c1173c9912ca0aa07bec204
drivers: media: video: Add omnivision5693 sensor

Signed-off-by: Brinly Taylor <uberlaggydarwin@gmail.com>

Change-Id: I951dbc8d333ff5f24133048b0435e3e9ebab11f3