Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
3196267
msm: camera: Return -NOTTY on invalid ioctl command.
Oct 9, 2017
75736c7
ASoC: compress: Fix compress capture stream handling
Aug 4, 2016
9d8303a
ASoC: compress: Fix compress device direction check
Jan 7, 2016
a509b91
ASoc: msm: qdsp6v2: Add support for compress capture
Nov 9, 2017
f58681e
Revert "ARM: dts: msm: Reset USB phy on every disconnect"
Nov 20, 2017
f168433
ASoC: msm: qdsp6v2: Add App type cfg support for Listen.
Jul 22, 2016
47e19de
net: usb: rmnet_usb_ctrl: Fix use after free issue
Nov 22, 2017
877ef70
Merge "Revert "ARM: dts: msm: Reset USB phy on every disconnect""
lnxbuild Nov 24, 2017
c0f0c2a
Merge "msm: camera: Return -NOTTY on invalid ioctl command."
lnxbuild Nov 27, 2017
26a6203
ipx: call ipxitf_put() in ioctl error path
May 2, 2017
699d488
ip6_gre: fix ip6gre_err() invalid reads
edumazet Feb 5, 2017
629a432
ext4: provide ext4_issue_zeroout()
Dec 7, 2015
44c71c0
mm/mempolicy.c: fix error handling in set_mempolicy and mbind.
salls Oct 13, 2017
152830c
Merge "ip6_gre: fix ip6gre_err() invalid reads"
lnxbuild Nov 30, 2017
f4c0027
Merge "ext4: provide ext4_issue_zeroout()"
lnxbuild Nov 30, 2017
c7d8ab9
Merge "mm/mempolicy.c: fix error handling in set_mempolicy and mbind."
lnxbuild Nov 30, 2017
ec57be0
Prevent potential double frees in sg driver
Mar 24, 2017
5ec0222
BACKPORT: ext4: fix data exposure after a crash
jankara Apr 24, 2016
7590caa
msm: ipa: add null terminator
Oct 7, 2017
e1e0610
Merge "msm: ipa: add null terminator"
lnxbuild Dec 5, 2017
63e3b95
Merge "ASoC: msm: qdsp6v2: Add App type cfg support for Listen."
lnxbuild Dec 7, 2017
62af46f
Merge "ASoC: compress: Fix compress device direction check"
lnxbuild Dec 8, 2017
720e25e
Merge "ASoC: compress: Fix compress capture stream handling"
lnxbuild Dec 9, 2017
34cea07
ASoC: msm: qdsp6v2: Add Support for compress record
Dec 7, 2017
f70b43d
ASoC : msm: qdsp6v2: set pointer to NULL after free.
Dec 12, 2017
0a9b80a
ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command
Oct 2, 2017
b3101d9
ALSA: pcm: remove unused variable from snd_pcm_info()
Oct 2, 2017
df7432f
Merge "ALSA: pcm: remove unused variable from snd_pcm_info()"
lnxbuild Dec 12, 2017
76392b7
Merge "ASoC : msm: qdsp6v2: set pointer to NULL after free."
lnxbuild Dec 13, 2017
529a4a7
Merge "net: usb: rmnet_usb_ctrl: Fix use after free issue"
lnxbuild Dec 14, 2017
edda7b5
Merge AU_LINUX_ANDROID_LA.BR.1.2.9_RB1.07.01.02.254.041 on remote branch
Dec 17, 2017
599e375
time: Always make sure wall_to_monotonic isn't positive
wyqkp Jun 23, 2015
e2532fb
Merge tag 'LA.BR.1.2.9-04310-8x16.0' of https://source.codeaurora.org…
luk1337 Dec 20, 2017
ff4a430
drivers/staging: prima: Import latest CAF release
luk1337 Dec 20, 2017
029985a
Revert "drivers/staging: wlan: Update key sequence counter to TL"
luk1337 Dec 21, 2017
99b5b7b
drivers: cpuidle: lpm-levels: Fix untrusted pointer dereference.
Nov 28, 2017
e199896
oc: qcom: rpm-smd-debug: Fix potential memory leaks
Dec 21, 2017
2bcf483
ASoC: msm: qdsp6v2: Set freed pointers to NULL
Dec 11, 2017
4f1f10f
sctp: do not inherit ipv6_{mc|ac|fl}_list from parent
edumazet May 17, 2017
ea785e5
Merge "sctp: do not inherit ipv6_{mc|ac|fl}_list from parent"
lnxbuild Dec 28, 2017
e9186e1
scsi: sg: check length passed to SG_NEXT_CMD_LEN
Feb 15, 2017
fc45cfe
sg: relax 16 byte cdb restriction
doug-gilbert Jun 3, 2014
59f2e8c
sched: Fix information leak in sys_sched_getattr()
vegard Feb 16, 2014
a0a452f
drivers: video: Add bounds checking in fb_cmap_to_user
spfetsch Oct 14, 2016
64c9efe
Merge "oc: qcom: rpm-smd-debug: Fix potential memory leaks"
lnxbuild Jan 4, 2018
cf3c00d
Merge "sched: Fix information leak in sys_sched_getattr()"
lnxbuild Jan 4, 2018
411db4e
Merge "drivers: video: Add bounds checking in fb_cmap_to_user"
lnxbuild Jan 4, 2018
fd45807
Merge "sg: relax 16 byte cdb restriction"
lnxbuild Jan 4, 2018
2026cba
Merge "drivers: cpuidle: lpm-levels: Fix untrusted pointer dereference."
lnxbuild Jan 4, 2018
0df96c8
msm: sensor: actuator: add null pointer check for i2c array
Dec 5, 2017
6ebc0d7
msm: adsprpc: Use unsigned integer for length values
Dec 20, 2017
7beec48
soc: qcom: pil: Fix error handling during PIL driver probe
Oct 25, 2017
bbbcba2
ALSA: pcm: add locks for accessing runtime resource
Sep 28, 2017
0d2d815
ALSA: pcm: use lock to protect substream runtime resource
Sep 28, 2017
71105d2
Merge "msm: adsprpc: Use unsigned integer for length values"
lnxbuild Jan 11, 2018
91455d2
Merge "soc: qcom: pil: Fix error handling during PIL driver probe"
lnxbuild Jan 11, 2018
666efe3
Merge "scsi: sg: check length passed to SG_NEXT_CMD_LEN"
lnxbuild Jan 11, 2018
57e33e8
Merge "msm: sensor: actuator: add null pointer check for i2c array"
lnxbuild Jan 11, 2018
9609ae1
ARM: dts: msm: add afe_loopback_tx back-end dai
Jan 11, 2018
caac7e3
ASoC: msm: set AFE_LOOPBACK_TX port id to EC ref port
Jan 11, 2018
a9472f4
ASoC: msm: add afe_loopback_tx dai-link
Jan 11, 2018
ca752cb
ASoC: msm: add afe_loopback_tx BE dai
Jan 11, 2018
5596845
ASoC: msm: add SECONDARY_MI2S_RX_SD1 entry in BE dais
Jan 11, 2018
2379ad5
Merge "ALSA: pcm: use lock to protect substream runtime resource"
lnxbuild Jan 11, 2018
528451e
Merge "ASoC: msm: add SECONDARY_MI2S_RX_SD1 entry in BE dais"
lnxbuild Jan 12, 2018
5ae2276
msm: ipa: Fix the handling of default IPA header
Dec 19, 2017
d66976b
ion: ensure CMO target is valid
Dec 4, 2017
bc5ead4
ARM: dts: msm: Update WCNSS apps region
Jan 11, 2018
67b4f66
msm: camera: isp: Handle array out of bounds
Jan 23, 2018
29e4fa3
Merge AU_LINUX_ANDROID_LA.BR.1.2.9_RB1.07.01.02.254.043 on remote branch
Jan 24, 2018
93ab32c
Merge "ARM: dts: msm: Update WCNSS apps region" into LA.BR.1.2.9_rb1.30
lnxbuild Jan 24, 2018
aa5d579
Merge "msm: camera: isp: Handle array out of bounds" into LA.BR.1.2.9…
lnxbuild Jan 24, 2018
14a5975
Revert "mm: vmscan: Add a debug file for shrinkers"
Apr 25, 2016
1277566
Merge tag 'LA.BR.1.2.9-04510-8x16.0' of https://source.codeaurora.org…
luk1337 Jan 31, 2018
5fd66aa
drivers/staging: prima: Import latest CAF release
luk1337 Jan 31, 2018
0747091
android: binder: support multiple context managers.
Sep 30, 2016
ed025a6
android: binder: deal with contexts in debugfs.
Oct 17, 2016
154d859
android: binder: support multiple /dev instances.
Sep 30, 2016
7ecdb0f
android: binder: split flat_binder_object.
Jul 13, 2016
c840a27
android: binder: refactor binder_transact()
Sep 29, 2016
f8b3618
android: binder: add extra size to allocator.
Sep 30, 2016
a65df34
android: binder: support for scatter-gather.
Sep 30, 2016
198f0a7
android: binder: support for file-descriptor arrays.
Oct 18, 2016
11918f3
android: binder: use copy_from_user_preempt_disabled
Oct 25, 2016
ca9dc4b
binder: use group leader instead of open thread
toddkjos Mar 6, 2017
4bc16a3
ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.
Jul 22, 2017
4ccaeb9
android: binder: Use wake up hint for synchronous transactions.
riandrews Oct 21, 2015
a2b75f1
android: binder: Disable preemption while holding the global binder l…
riandrews Sep 15, 2015
5e6c69a
UPSTREAM: capabilities: ambient capabilities
amluto Sep 4, 2015
a295f40
BACKPORT: commoncap: don't alloc the credential unless needed in cap_…
Jul 22, 2014
5923a49
arch/arm64: configs: Enable CONFIG_CC_STACKPROTECTOR_REGULAR
luk1337 Sep 8, 2017
ef8efb5
x86: Add missing changes from "seccomp: add "seccomp" syscall"
luk1337 Sep 12, 2017
e21a53f
seccomp: fix syscall numbers for x86 and x86_64
leecam Oct 8, 2014
b0b6abb
BACKPORT: random32: add periodic reseeding
strssndktn Nov 11, 2013
03f6561
BACKPORT: random32: add prandom_reseed_late() and call when nonblocki…
strssndktn Nov 11, 2013
eb4383b
BACKPORT: random: introduce getrandom(2) system call
tytso Jul 17, 2014
f690d65
BACKPORT: random: Wake up all getrandom(2) callers when pool is ready
herbertx May 21, 2015
cab6550
BACKPORT: ARM: wire up getrandom syscall
Aug 8, 2014
feb2525
selinux: enable per-file labeling for debugfs files.
stephensmalley May 19, 2015
732cce0
selinux: enable genfscon labeling for sysfs and pstore files
stephensmalley May 20, 2015
334c54a
ANDROID: mnt: Fix freeing of mount data
drosen-google Sep 6, 2017
a0f86fd
ANDROID: Sdcardfs: Move gid derivation under flag
drosen-google Jul 20, 2017
1945277
ANDROID: sdcardfs: Add missing break
drosen-google Sep 9, 2017
c99908b
arch/arm64: configs: Enable CONFIG_PROC_DEVICETREE
luk1337 Dec 20, 2017
5434635
ARM: dts: msm: Early mount of system partition for ASUS devices
Aug 14, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
};

&peripheral_mem {
reg = <0x0 0x8a400000 0x0 0x0500000>;
reg = <0x0 0x8a400000 0x0 0x0700000>;
};

&i2c_4 {
Expand Down
8 changes: 5 additions & 3 deletions arch/arm/boot/dts/qcom/apq8009-audio-external_codec.dtsi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -98,7 +98,8 @@
<&incall_record_rx>, <&incall_record_tx>,
<&incall_music_rx>, <&incall_music_2_rx>,
<&bt_sco_rx>,
<&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>;
<&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>,
<&afe_loopback_tx>;
asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-hdmi.8",
"msm-dai-q6-mi2s.0",
"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
Expand All @@ -112,7 +113,8 @@
"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
"msm-dai-q6-dev.32770",
"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",
"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293";
"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293",
"msm-dai-q6-dev.24577";
asoc-codec = <&stub_codec>;
asoc-codec-names = "msm-stub-codec.1";
qcom,max-aux-codec = <2>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326-refboard.dts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
};

&peripheral_mem {
reg = <0x0 0x8a400000 0x0 0x0500000>;
reg = <0x0 0x8a400000 0x0 0x0700000>;
};

&i2c_4 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326.dts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
};

&peripheral_mem {
reg = <0x0 0x8a400000 0x0 0x0500000>;
reg = <0x0 0x8a400000 0x0 0x0700000>;
};

7 changes: 6 additions & 1 deletion arch/arm/boot/dts/qcom/msm8909.dtsi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2016, 2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -1465,6 +1465,11 @@
qcom,msm-dai-q6-dev-id = <12292>;
};

afe_loopback_tx: qcom,msm-dai-q6-afe-loopback-tx {
compatible = "qcom,msm-dai-q6-dev";
qcom,msm-dai-q6-dev-id = <24577>;
};

int_fm_tx: qcom,msm-dai-q6-int-fm-tx {
compatible = "qcom,msm-dai-q6-dev";
qcom,msm-dai-q6-dev-id = <12293>;
Expand Down
17 changes: 17 additions & 0 deletions arch/arm/boot/dts/qcom/msm8916-ze550kl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,23 @@
bootargs = "sched_enable_hmp=1";
};

firmware: firmware {
android {
compatible = "android,firmware";
fstab {
compatible = "android,fstab";
system {
compatible = "android,system";
dev = "/dev/block/platform/soc.0/7824900.sdhci/by-name/system";
type = "ext4";
mnt_flags = "ro,barrier=1,discard";
fsmgr_flags = "wait";
status = "ok";
};
};
};
};

aliases {
sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
sdhc2 = &sdhc_2; /* SDC2 SD card slot */
Expand Down
17 changes: 17 additions & 0 deletions arch/arm/boot/dts/qcom/msm8939-zd550kl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,23 @@
chosen {
bootargs = "boot_cpus=0,4,5,6,7 sched_enable_hmp=1";
};

firmware: firmware {
android {
compatible = "android,firmware";
fstab {
compatible = "android,fstab";
system {
compatible = "android,system";
dev = "/dev/block/platform/soc.0/7824900.sdhci/by-name/system";
type = "ext4";
mnt_flags = "ro,barrier=1,discard";
fsmgr_flags = "wait";
status = "ok";
};
};
};
};
};

&soc {
Expand Down
17 changes: 17 additions & 0 deletions arch/arm/boot/dts/qcom/msm8939-ze550kl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,23 @@
chosen {
bootargs = "boot_cpus=0,4,5,6,7 sched_enable_hmp=1";
};

firmware: firmware {
android {
compatible = "android,firmware";
fstab {
compatible = "android,fstab";
system {
compatible = "android,system";
dev = "/dev/block/platform/soc.0/7824900.sdhci/by-name/system";
type = "ext4";
mnt_flags = "ro,barrier=1,discard";
fsmgr_flags = "wait";
status = "ok";
};
};
};
};
};

&soc {
Expand Down
17 changes: 17 additions & 0 deletions arch/arm/boot/dts/qcom/msm8939-ze600kl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,23 @@
chosen {
bootargs = "boot_cpus=0,4,5,6,7 sched_enable_hmp=1";
};

firmware: firmware {
android {
compatible = "android,firmware";
fstab {
compatible = "android,fstab";
system {
compatible = "android,system";
dev = "/dev/block/platform/soc.0/7824900.sdhci/by-name/system";
type = "ext4";
mnt_flags = "ro,barrier=1,discard";
fsmgr_flags = "wait";
status = "ok";
};
};
};
};
};

&soc {
Expand Down
12 changes: 11 additions & 1 deletion arch/arm/include/asm/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@

#include <uapi/asm/unistd.h>

#define __NR_syscalls (384)
/*
* This may need to be greater than __NR_last_syscall+1 in order to
* account for the padding in the syscall table
*/
#define __NR_syscalls (385)

/*
* *NOTE*: This is a ghost syscall private to the kernel. Only the
* __kuser_cmpxchg code in entry-armv.S should be aware of its
* existence. Don't ever use this from user code.
*/
#define __ARM_NR_cmpxchg (__ARM_NR_BASE+0x00fff0)

#define __ARCH_WANT_STAT64
Expand Down
6 changes: 1 addition & 5 deletions arch/arm/include/uapi/asm/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,7 @@
#define __NR_renameat2 (__NR_SYSCALL_BASE+382)
*/
#define __NR_seccomp (__NR_SYSCALL_BASE+383)

/*
* This may need to be greater than __NR_last_syscall+1 in order to
* account for the padding in the syscall table
*/
#define __NR_getrandom (__NR_SYSCALL_BASE+384)

/*
* The following SWIs are ARM private.
Expand Down
1 change: 1 addition & 0 deletions arch/arm/kernel/calls.S
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
CALL(sys_sched_getattr)
CALL(sys_ni_syscall) /* reserved sys_renameat2 */
CALL(sys_seccomp)
CALL(sys_getrandom)
#ifndef syscalls_counted
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
#define syscalls_counted
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/configs/Z00L_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ CONFIG_EMBEDDED=y
# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
CONFIG_PROFILING=y
CONFIG_CC_STACKPROTECTOR_REGULAR=y
CONFIG_PARTITION_ADVANCED=y
# CONFIG_IOSCHED_TEST is not set
CONFIG_IOSCHED_BFQ=y
Expand Down Expand Up @@ -211,6 +212,7 @@ CONFIG_IPC_ROUTER=y
CONFIG_IPC_ROUTER_SECURITY=y
CONFIG_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/configs/Z00T_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ CONFIG_EMBEDDED=y
# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
CONFIG_PROFILING=y
CONFIG_CC_STACKPROTECTOR_REGULAR=y
CONFIG_PARTITION_ADVANCED=y
# CONFIG_IOSCHED_TEST is not set
CONFIG_IOSCHED_BFQ=y
Expand Down Expand Up @@ -211,6 +212,7 @@ CONFIG_IPC_ROUTER=y
CONFIG_IPC_ROUTER_SECURITY=y
CONFIG_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
Expand Down
3 changes: 3 additions & 0 deletions arch/x86/syscalls/syscall_32.tbl
Original file line number Diff line number Diff line change
Expand Up @@ -359,3 +359,6 @@
350 i386 finit_module sys_finit_module
351 i386 sched_setattr sys_sched_setattr
352 i386 sched_getattr sys_sched_getattr
# 353 i386 renameat2 sys_renameat2
354 i386 seccomp sys_seccomp
355 i386 getrandom sys_getrandom
3 changes: 3 additions & 0 deletions arch/x86/syscalls/syscall_64.tbl
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@
313 common finit_module sys_finit_module
314 common sched_setattr sys_sched_setattr
315 common sched_getattr sys_sched_getattr
# 316 common renameat2 sys_renameat2
317 common seccomp sys_seccomp
318 common getrandom sys_getrandom

#
# x32-specific system call numbers start at 512 to avoid cache impact
Expand Down
Loading