Age | Commit message (Collapse) | Author |
|
am: 152a93e7eb
Change-Id: Icac25f498e6320ea4df53593a3bc68d6b515978b
|
|
am: 1b20cef36b
Change-Id: I157efe9bafb36d3725340fc02560ba5d7ec3764e
|
|
am: 3b67c0086e
Change-Id: I9dfd9660eab09034915b1434f7907ad22d8cb94b
|
|
am: a2d88fdf01
Change-Id: I9dd502ec659c629777206b5b90befb2aace50a5b
|
|
|
|
0a879a2705 am: 38b695f04f -s ours am: 51b6acdb83
am: 640c414200
Change-Id: Ib88b5362c2a7f1109a772b7e071377e292d154c7
|
|
0a879a2705 am: 38b695f04f -s ours
am: 51b6acdb83
Change-Id: I79f9cf84827e6bebcf38935b87bac7fa32e1232f
|
|
0a879a2705
am: 3689bee55e -s ours
Change-Id: I9d562b914b48dd25b8fed5b02819aece6b19eed7
|
|
0a879a2705
am: 38b695f04f -s ours
Change-Id: Ifafbfc3b0c7e2b46a651418c1dda29e8a90de78b
|
|
am: 0a879a2705
Change-Id: I7120f34dcfce3d09700ae4e1359a58616ea07a82
|
|
am: 0a879a2705
Change-Id: I3262355740adc85e10fb51ad46ec565fda210809
|
|
6acf95d input: touchscreen: Synaptics: prevent sysfs races
3a8c228 input: synaptics: defer sysfs creation during init
a420466 BACKPORT: audit: fix a double fetch in audit_log_single_execve_arg()
d11e05b cgroup: prefer %pK to %p
fac16f6 UPSTREAM: perf: Fix race in swevent hash
90f103f input: synaptics_dsx: add checks of user input data
9c43405 BACKPORT: ALSA: usb-audio: Fix double-free in error paths after snd_usb_add_audio_stream() call
baad3a9 BACKPORT: ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
73422f2 UPSTREAM: block: fix use-after-free in sys_ioprio_get()
d280a3b UPSTREAM: HID: core: prevent out-of-bound readings
717d787 BACKPORT: tty: Prevent ldisc drivers from re-using stale tty fields
17423fb UPSTREAM: proc: prevent accessing /proc/<PID>/environ until it's ready
162aca3 UPSTREAM: [media] xc2028: unlock on error in xc2028_set_config()
f2a9870 UPSTREAM: [media] xc2028: avoid use after free
b408bd4 UPSTREAM: block: fix use-after-free in seq file
0724ef9 UPSTREAM: USB: cdc-acm: more sanity checking
a795801 UPSTREAM: USB: iowarrior: fix oops with malicious USB descriptors
7fd2bd0 UPSTREAM: USB: usb_driver_claim_interface: add sanity checking
02dd2b2 UPSTREAM: USB: mct_u232: add sanity checking in probe
8d72f1b UPSTREAM: USB: cypress_m8: add endpoint sanity check
490e3c7 UPSTREAM: Input: powermate - fix oops with malicious USB descriptors
eebf8d2 ASoC: check for null function pointer for dummy device read/write
31b3db7 quadd: add nr_events check
b81ed20 Tegra TLK Driver missing kernel heap allocation succeeded check
fc62c36 UPSTREAM: tcp: fix use after free in tcp_xmit_retransmit_queue()
last commit before this set is:
e8084ec binder: prevent kptr leak by using %pK format specifier HAHA
NB: Bug: 28694392 in security bulletin does not apply to this kernel
NB: Bug: 27532522 in security bulletin does not apply to this kernel
NB: Bug: 30400942 in security bulletin does not apply to this kernel
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 31252388
Bug: 30799828
Bug: 30956807
Bug: 30149174
Bug: 30952077
Bug: 30937462
Bug: 30952477
Bug: 30946378
Bug: 30951261
Bug: 30951112
Bug: 30951939
Bug: 30946097
Bug: 30942273
Bug: 28242610
Bug: 28838221
Bug: 29492476
Bug: 30259274
Bug: 31183296
Change-Id: Id9897cb78a4a604a24df904a7ae9675fc696262f
|
|
de7c57d input: touchscreen: Synaptics: prevent sysfs races
fcf9059 input: synaptics: defer sysfs creation during init
3724945 net: inet: diag: expose the socket mark to privileged processes.
a6226bb net: diag: make udp_diag_destroy work for mapped addresses.
f7d5f82 net: diag: support SOCK_DESTROY for UDP sockets
d4c5e38 net: diag: allow socket bytecode filters to match socket marks
4a63970 net: diag: slightly refactor the inet_diag_bc_audit error checks.
41e1e3f net: diag: Add support to filter on device index
4bc74f1 BACKPORT: audit: fix a double fetch in audit_log_single_execve_arg()
8c43520 UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor
5bc4531 BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7
dd7047a cgroup: prefer %pK to %p
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 31252388
Bug: 30799828
Bug: 30956807
Bug: 31161206
Bug: 30149174
Change-Id: Ic4a45f414d783b97d54c9ec9a73d04cbf599fc59
|
|
am: b9eb5d3a93
Change-Id: Ib1ab97dc86e67ede29316a1772d328d7371a6284
|
|
am: 27686a7a34
Change-Id: I2a8d1c300f08548b072ea10ec63a23994f3d623e
|
|
9c4afa9 UPSTREAM: perf: Fix race in swevent hash
639e0ec UPSTREAM: perf: Prevent false warning in perf_swevent_add
ff10406 UPSTREAM: perf: Fix hotplug splat
a9bb706 input: synaptics_dsx: add checks of user input data
bdcd4484 UPSTREAM: capabilities: ambient capabilities
0e7ad12 BACKPORT: ALSA: usb-audio: Fix double-free in error paths after snd_usb_add_audio_stream() call
5982d2e BACKPORT: ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
b581331 pstore: drop pmsg bounce buffer
fbb62d1 UPSTREAM: block: fix use-after-free in sys_ioprio_get()
8aaed94 UPSTREAM: HID: core: prevent out-of-bound readings
b307df3 BACKPORT: tty: Prevent ldisc drivers from re-using stale tty fields
d85e322 Don't show empty tag stats for unprivileged uids
991eaa6 UPSTREAM: proc: prevent accessing /proc/<PID>/environ until it's ready
12f0688 UPSTREAM: [media] xc2028: unlock on error in xc2028_set_config()
9469da1 UPSTREAM: [media] xc2028: avoid use after free
300e001 UPSTREAM: block: fix use-after-free in seq file
6a88f39 ANDROID: base-cfg: enable SECCOMP config
801c5f9 UPSTREAM: USB: cdc-acm: more sanity checking
2fac1c2 UPSTREAM: USB: iowarrior: fix oops with malicious USB descriptors
e846f8e UPSTREAM: USB: usb_driver_claim_interface: add sanity checking
2633b8d UPSTREAM: USB: mct_u232: add sanity checking in probe
7a17891 UPSTREAM: USB: cypress_m8: add endpoint sanity check
cb2cecc UPSTREAM: Input: powermate - fix oops with malicious USB descriptors
4f73004 Revert "netfilter: have ip*t REJECT set the sock err when an icmp is to be sent"
6ff842a ANDROID: MMC: Fix a 32 bit build breakage.
d54ba4d UPSTREAM: af_unix: Guard against other == sk in unix_dgram_sendmsg
9e63349 UPSTREAM: ALSA: timer: Fix race among timer ioctls
4a55158 ASoC: check for null function pointer for dummy device read/write
2fbdb8e quadd: add nr_events check
209e5c6 Tegra TLK Driver missing kernel heap allocation succeeded check
a31bf47 UPSTREAM: tcp: fix use after free in tcp_xmit_retransmit_queue()
NB: removed commits already present, or that were added then reverted
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 30952077
Bug: 30937462
Bug: 31038224
Bug: 30952477
Bug: 31057326
Bug: 30946378
Bug: 30951261
Bug: 30951112
Bug: 31183296
Bug: 27577101
Bug: 27532522
Bug: 30951939
Bug: 30946097
Bug: 30942273
Bug: 28242610
Bug: 28719525
Bug: 28694392
Bug: 28838221
Bug: 29492476
Bug: 30259274
Change-Id: I4114b2eea0123d4e1f4dba413dc51061f468bfa2
|
|
am: 36e5ddbed9
Change-Id: Iacacd6fd55f21181bf145cb32933b2ac1db4e9ba
|
|
am: 6b85a08f17
Change-Id: I182654602d6687878696fbb071ec32ae7bc12957
|
|
98c9a26 Merge tag 'v3.10.103' into android-tegra-flounder-3.10-nyc-mr1
Bug: 28242610
Bug: 30259163
Change-Id: I0b2cb81c25ab004bae28543d2f108bb2ba24d33d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
|
|
ours am: 226d8f3d31 am: 2704efd084 -s ours am: 9f1f6253d8 am: c47012a709 am: 810bd266c3
am: fc76dd63ee
Change-Id: I5df2f84ca4dec24a1b904e771dcc8fe2b5690a2b
|
|
ours am: 226d8f3d31 am: 2704efd084 -s ours am: 9f1f6253d8 am: c47012a709
am: 810bd266c3
Change-Id: I5fc048429422a7b9217933b27b1efabde52fe50d
|
|
ours am: 226d8f3d31 am: 2704efd084 -s ours am: 9f1f6253d8
am: 8d0ce1957b
Change-Id: Icde9050ee4b9e34dae8b6466a31e42fac8ff75ca
|
|
ours am: 226d8f3d31 am: 2704efd084 -s ours am: 9f1f6253d8
am: c47012a709
Change-Id: I1c767ce4457b4fdb1c94dbe639f0fbe20e4096ce
|
|
ours am: 226d8f3d31 am: 2704efd084 -s ours
am: 9f1f6253d8
Change-Id: I2f17c235436c21dd6d079508b024f10330094aac
|
|
ours am: 226d8f3d31 am: 2704efd084 -s ours
am: 9f1f6253d8
Change-Id: Id5488a188eeda3b35f9ecf6def62162d4a6386de
|
|
ours am: 226d8f3d31
am: 2704efd084 -s ours
Change-Id: Ie91d5e6932f6f74b58d8367e7c2d3e3a9ba631a1
|
|
ours
am: 226d8f3d31
Change-Id: Ie8607c6110a99d8dd0e6af145a9c7591064be40f
|
|
am: f76c52bbae -s ours
Change-Id: Iea1fc49b4ea9e30c99aae47439f78299f48c6ef3
|
|
2e7131e65b am: 40190c9b72
am: a5a760ed1f
Change-Id: I7bb4d623d4385fca7cac69b2243ba9ba906afc15
|
|
2e7131e65b
am: 40190c9b72
Change-Id: Id7397e40bae0e0beb0244a75b59866f171531ca2
|
|
am: 2e7131e65b
Change-Id: I53d9b92d0703189b8f33e4ba24345e3608cbdb52
|
|
am: 32e4909372
Change-Id: I32fa5175871bc47ef1a83f8d7eda98d4f01aa8de
|
|
am: 659282afac
Change-Id: Ibfc9b541994a7ef2694f19872d31e4e05d483dbc
|
|
am: 659282afac
Change-Id: I025ed29c184be0dc3ef773d624c2611159f7e906
|
|
ae993e4 media: tegra: Add MFI init/de-init code for drv201
16d2f32 dts: flounder: remove camera dtsi files.
b08f52c flounder: register camera devices using boardfiles
b3cc6ee binder: prevent kptr leak by using %pK format specifier
073e023 tegra: quadd: fix stack information leak bug in case IOCTL_GET_STATE
503f192 ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct
bfeb261 ANDROID: binder: Add strong ref checks
5793f33 quadd: fix stack info leak when getting capabilities
a3879a6 mmc: card: test: Fix out of boundary array access
d85ccef BACKPORT: Bluetooth: Fix potential NULL dereference in RFCOMM bind callback
a7f13e9 UPSTREAM: ecryptfs: don't allow mmap when the lower fs doesn't support it
acd30a1 BACKPORT: tcp: make challenge acks less predictable
a0541b7 UPSTREAM: net: Fix use after free in the recvmmsg exit path
ae1e9cf tegra: quadd: fix stack information disclose bug
79baf4a6e gpu: nvgpu: initialize local variable
95bac36 staging: android: Change %p to %pK in debug messages
NB: commit/reverts squashed out of list
Right after Sep MR2 commit
493780e ANDROID: tegra: cl_dvfs arbitrary kernel memory access
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 28760138
Bug: 30143283
Bug: 30148243
Bug: 30149612
Bug: 30162222
Bug: 30163101
Bug: 30204201
Bug: 30259955
Bug: 30445380
Bug: 30515201
Bug: 30593080
Bug: 30768347
Bug: 30809774
Change-Id: I74420eba5bd067e5e137058959bb8852d98c822b
|
|
e8084ec binder: prevent kptr leak by using %pK format specifier
56b36fc tegra: quadd: fix stack information leak bug in case IOCTL_GET_STATE
9bf0af9 ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct
fad3cb3 ANDROID: binder: Add strong ref checks
a16cab6 quadd: fix stack info leak when getting capabilities
0e1e56d mmc: card: test: Fix out of boundary array access
1ac2e09 media: tegra: Add MFI init/de-init code for drv201
5c0ed9b dts: flounder: remove camera dtsi files.
230b602 flounder: register camera devices using boardfiles
e693691 ipv6: fix endianness error in icmpv6_err
4944f26 net: ipv6: Fix ping to link-local addresses.
39e7abb BACKPORT: Bluetooth: Fix potential NULL dereference in RFCOMM bind callback
952f5d2 UPSTREAM: ecryptfs: don't allow mmap when the lower fs doesn't support it
67418b6 BACKPORT: tcp: make challenge acks less predictable
5293558 UPSTREAM: net: Fix use after free in the recvmmsg exit path
a689639 tegra: quadd: fix stack information disclose bug
e8d1e37 gpu: nvgpu: initialize local variable
5b14cdf staging: android: Change %p to %pK in debug messages
0ae8be1 flounder: Add IPv6 rpfilter support.
NB: commit/reverts squashed out of list.
last commit before this set is:
a139acc ANDROID: tegra: cl_dvfs arbitrary kernel memory access
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 9580643
Bug: 28760138
Bug: 29370996
Bug: 30143283
Bug: 30148243
Bug: 30149612
Bug: 30162222
Bug: 30163101
Bug: 30204201
Bug: 30259955
Bug: 30298058
BUG: 30445380
Bug: 30515201
Bug: 30593080
Bug: 30768347
Bug: 30809774
Change-Id: I03a5e1dccb8360b0b2fc61cf59db236ca065ac4a
|
|
am: 3ca9a1ff6e
Change-Id: I8b002f5f6c477903c01169ac884e7341634b8465
|
|
am: 1f4c5a12b0
Change-Id: If8f56cecc4a200d0ece43e50854922008603c6a2
|
|
|
|
am: 4b27b684ed
Change-Id: I19d2ad0f12a38a84771521c5ed033b63b469b80b
|
|
am: f02e5ea29d -s ours
Change-Id: I5063f3d849d9bc8379d7e04fb89add06c21180f1
|
|
am: 104e3442c9 -s ours
Change-Id: Ia2ec991e6abf4136065aba6138d869ca4ade0942
|
|
am: 104e3442c9
Change-Id: I0a71463874224b39a1815577715c32227f57a29b
|
|
a139acc ANDROID: tegra: cl_dvfs arbitrary kernel memory access
c267ff1 CHROMIUM: android: binder: Fix potential scheduling-while-atomic
7e6931a fs: ext4: disable support for fallocate FALLOC_FL_PUNCH_HOLE
2dd005c media: tegra: nvavp: Fix reloc offset check
4584ab1 input: synaptics_dsx: allocate heap memory for temp buf
005fd17 net: wireless: bcmdhd: security vulnerability - protect array overflow in PNO
1f23703 UPSTREAM: netfilter: x_tables: make sure e->next_offset covers remaining blob size
5f24fc4 UPSTREAM: netfilter: x_tables: validate e->target_offset early
b211bd6 UPSTREAM: KEYS: Fix ASN.1 indefinite length object parsing
a738ffa UPSTREAM: ALSA: control: Fix replacing user controls
e11ce62 UPSTREAM: ppp: take reference on channels netns
51ca447 UPSTREAM: ipv6: tcp: add rcu locking in tcp_v6_send_synack()
e5ee61a UPSTREAM: netfilter: x_tables: fix unconditional helper
a49c3c3 UPSTREAM: ipv6: Don't reduce hop limit for an interface
af1c2a8 UPSTREAM: ipv4: try to cache dst_entries which would cause a redirect
8d579e4 UPSTREAM: ASN.1: Fix non-match detection failure on data overrun
eaa2cf6 ANDROID: sdcardfs: fix itnull.cocci warnings
8a1b654 android-recommended.cfg: enable fstack-protector-strong
552e984 UPSTREAM: KEYS: close race between key lookup and freeing
500635f sdcardfs: Truncate packages_gid.list on overflow
e0328ff UPSTREAM: cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind
67b6ba5 UPSTREAM: udp: fix behavior of wrong checksums
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 27441354
Bug: 28744625
Bug: 28751627
Bug: 28760453
Bug: 28799389
Bug: 28940694
Bug: 28967314
Bug: 28979703
Bug: 29009982
Bug: 29119002
Bug: 29409847
Bug: 29506807
Bug: 29507402
Bug: 29510361
Bug: 29518457
Bug: 29535845
Bug: 29637687
Bug: 29814470
Bug: 29823941
Bug: 29916012
Bug: 30013843
Bug: 30141999
Change-Id: Ie72e5f7db40e8f20e1a7c8f4f383584ef032cadf
|
|
ours am: e327abc3c6 am: 0f5ff2e504 -s ours am: 62259caa60
am: 2be808469a
Change-Id: Id80d8f61a0c7e8b83ee2d4d1247fb842ba701355
|
|
ours am: e327abc3c6 am: 0f5ff2e504 -s ours am: 62259caa60
am: 635573ab99
Change-Id: I90de2fc22587ef1595814b03514565ad71345582
|
|
ours am: e327abc3c6 am: 0f5ff2e504 -s ours
am: 62259caa60
Change-Id: Ifbb6398c4d15b8577012883b2c82dc809f4fbb4c
|
|
ours am: e327abc3c6 am: 0f5ff2e504 -s ours
am: 62259caa60
Change-Id: I1ad1e5ef38727718d156a259123fdcd5c8aa64bf
|
|
ours am: e327abc3c6
am: 0f5ff2e504 -s ours
Change-Id: If50af0bdcf7d95fb576ae5957e8bef475d290d1d
|
|
ours
am: e327abc3c6
Change-Id: I8ac046c3d65078774697282f85d87f767a2f11f2
|