summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterHEADandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7oreo-mr1-iot-releaseoreo-mr1-1.2-iot-releaseo-mr1-iot-preview-8o-mr1-iot-preview-7mastermainXin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I8d80b57ca65a19b08457d0138583d2743b7fa1f1
2017-10-17angler: update kernel prebuilt [ DO NOT MERGE ANYWHERE ] am: e6d23dce9d -s ↵Steve Pfetsch
ours am: b509be51ef -s ours am: 9dc866077b -s ours Change-Id: Ibb2aed85556ca947e87c68a88d61f84e46081964
2017-10-17angler: update kernel prebuilt [ DO NOT MERGE ANYWHERE ] am: e6d23dce9d -s oursSteve Pfetsch
am: b509be51ef -s ours Change-Id: Ia4a4a776ef7bcfd1b2d45bdf1126f244d3d65bf9
2017-10-16angler: update kernel prebuilt [ DO NOT MERGE ANYWHERE ] am: e6d23dce9d -s ↵Steve Pfetsch
ours am: b509be51ef -s ours am: 598647b57d -s ours Change-Id: I5444480beee4af55897fbbfb4b04190b4c4c94a1
2017-10-16angler: update kernel prebuilt [ DO NOT MERGE ANYWHERE ] am: e6d23dce9d -s oursoreo-mr1-devSteve Pfetsch
am: b509be51ef -s ours Change-Id: I1b5190a88565415c06e5fc137573a14d529958d6
2017-10-16angler: update kernel prebuilt [ DO NOT MERGE ANYWHERE ]Steve Pfetsch
am: e6d23dce9d -s ours Change-Id: I641b20a464fe953e376fdd0ad0452a09333a1275
2017-10-15angler: update kernel prebuiltSteve Pfetsch
am: c818f5d911 Change-Id: Ie89a48df436aff5490c7c38c4a19d769a23cb667
2017-10-13angler: update kernel prebuiltSteve Pfetsch
33ace82f Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10 e40328e1 Merge branch 'android-msm-angler-3.10-oc-security-next' into android-msm-angler-3.10-oc 2970ea4d msm: gud: Remove gud driver 5bc4ce2d qseecom: Fix accessing userspace memory in kernel space 3e28042f ANDROID: scsi: Add segment checking in sg_read 01517e20 msm: camera: Make use of mutex lock to avoid race condition 853d7b9c ASoC: msm: qdsp6v2: clear address on error 9a4c1e0b coresight: tmc: Fix the unbalanced lock in tmc_read() f169d05a coresight: tmc: Fix use after free issue with tmc read 3c968bdc fbdev: msm: Allocate fd with O_CLOEXEC flag 7e173b87 msm: mdss: validate page id before reading from edid buffer 3a2e3ad0 msm: ipa: Add mutext protection when updating notify req cache 0a420e78 BACKPORT: dentry name snapshots e508bde8 angler: remove 'reboot edl' interface for security. 4610f465 msm: sensor: Add mutex lock during ois power down operations dbef9f3d diag: Fix for possible dci stale entries 6ccf834f diag: dci: Add protection while querying event status f2950995 diag: dci: Add mutex protection while accessing client details ed4971fe diag: dci: Add protection while de-initializing clients aa469e2b ANDROID: usb: gadget: f_mtp: Return error if count is negative 0ee2dead UPSTREAM: ALSA: timer: Call notifier in the same spinlock 7624de59 UPSTREAM: ALSA: timer: Fix race between stop and interrupt 6f0ad078 UPSTREAM: ALSA: timer: Fix link corruption due to double start or stop 7788324e UPSTREAM: ALSA: timer: Code cleanup ecc778d1 BACKPORT: ALSA: timer: Fix race at concurrent reads c1e018be BACKPORT: ALSA: timer: Handle disconnection more safely 64c4227a UPSTREAM: ALSA: timer: Fix wrong instance passed to slave callbacks 60ad62eb UPSTREAM: ALSA: timer: Harden slave timer list handling 4e61984d UPSTREAM: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT 21e752fc BACKPORT: ALSA: timer: Fix race between read and ioctl d1fa005f msm: vidc: Squash the below changes 58bdb3fa v4l2: Refactor, fix security bug in compat ioctl32 cc0f3058 msm: camera: Avoid deadlock for vb2 operations using separate lock adfa0c9a ANDROID: ion: Fix uninitialized variable 4c7961ac Bluetooth: cmtp: cmtp_add_connection() should verify that it's dealing with l2cap socket 6442d6bf Bluetooth: bnep: bnep_add_connection() should verify that it's dealing with l2cap socket 6ba11925 ANDROID: usb: gadget: f_mtp: Return error if count is negative 30a02c52 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10-oc-security-next cbd5a934 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10-oc-security-next 49a94690 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10-oc-security-next Linux version 3.10.73-g33ace82f84b (android- build@xpcc7.ams.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Oct 13 04:41:33 UTC 2017 Bug: 33982955 Bug: 34276203 Bug: 34329758 Bug: 34624167 Bug: 35138888 Bug: 37240993 Bug: 37429972 Bug: 62201221 Bug: 62378232 Bug: 62674846 Bug: 63100473 Bug: 63173776 Bug: 63689921 Bug: 63868933 Bug: 64431967 Bug: 64453105 Bug: 64453422 Bug: 64453423 Bug: 64728950 Bug: 65023233 Bug: 65468973 Bug: 65468975 Bug: 65468993 Bug: 67749245 Change-Id: I55e7959b30f47185851bf4ede5f2fcf05d93f332 Source-Branch: android-msm-angler-3.10 Signed-off-by: Steve Pfetsch <spfetsch@google.com>
2017-10-13angler: update kernel prebuilt [ DO NOT MERGE ANYWHERE ]Steve Pfetsch
e40328e1 Merge branch 'android-msm-angler-3.10-oc-security-next' into android-msm-angler-3.10-oc 2970ea4d msm: gud: Remove gud driver 5bc4ce2d qseecom: Fix accessing userspace memory in kernel space 3e28042f ANDROID: scsi: Add segment checking in sg_read 01517e20 msm: camera: Make use of mutex lock to avoid race condition 853d7b9c ASoC: msm: qdsp6v2: clear address on error 9a4c1e0b coresight: tmc: Fix the unbalanced lock in tmc_read() f169d05a coresight: tmc: Fix use after free issue with tmc read 3c968bdc fbdev: msm: Allocate fd with O_CLOEXEC flag 7e173b87 msm: mdss: validate page id before reading from edid buffer 3a2e3ad0 msm: ipa: Add mutext protection when updating notify req cache 0a420e78 BACKPORT: dentry name snapshots e508bde8 angler: remove 'reboot edl' interface for security. 4610f465 msm: sensor: Add mutex lock during ois power down operations dbef9f3d diag: Fix for possible dci stale entries 6ccf834f diag: dci: Add protection while querying event status f2950995 diag: dci: Add mutex protection while accessing client details ed4971fe diag: dci: Add protection while de-initializing clients aa469e2b ANDROID: usb: gadget: f_mtp: Return error if count is negative 0ee2dead UPSTREAM: ALSA: timer: Call notifier in the same spinlock 7624de59 UPSTREAM: ALSA: timer: Fix race between stop and interrupt 6f0ad078 UPSTREAM: ALSA: timer: Fix link corruption due to double start or stop 7788324e UPSTREAM: ALSA: timer: Code cleanup ecc778d1 BACKPORT: ALSA: timer: Fix race at concurrent reads c1e018be BACKPORT: ALSA: timer: Handle disconnection more safely 64c4227a UPSTREAM: ALSA: timer: Fix wrong instance passed to slave callbacks 60ad62eb UPSTREAM: ALSA: timer: Harden slave timer list handling 4e61984d UPSTREAM: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT 21e752fc BACKPORT: ALSA: timer: Fix race between read and ioctl d1fa005f msm: vidc: Squash the below changes 58bdb3fa v4l2: Refactor, fix security bug in compat ioctl32 cc0f3058 msm: camera: Avoid deadlock for vb2 operations using separate lock adfa0c9a ANDROID: ion: Fix uninitialized variable 4c7961ac Bluetooth: cmtp: cmtp_add_connection() should verify that it's dealing with l2cap socket 6442d6bf Bluetooth: bnep: bnep_add_connection() should verify that it's dealing with l2cap socket 30a02c52 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10-oc-security-next 79df07b4 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-oc 4b39d42e Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 77a57c44 net: usb: rmnet_usb_ctrl:Make sure list_head operate atomically 93f53a7c ASoC: msm: qdspv2: add mutex to prevent access same memory simultaneously 9c253523 msm: mdss: hdmi: check up-bound of CEC frame size e13a16c0 msm: camera2: cpp: Fix iommu_attach/detach compat_ioctl issue eaf19c1d UPSTREAM: brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx() dc8f7a19 SoC: msm: audio-effects: return directly to avoid integer overflow 218d3a52 msm: kgsl: Protect the event->handle with spinlock fb50f3fa diag: Add proper synchronization checks to msg mask table 52aa15ae BACKPORT: perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race c5f12b74 cfg80211: Define nla_policy for NL80211_ATTR_LOCAL_MESH_POWER_MODE 568a0573 cfg80211: Check if PMKID attribute is of expected size c46b2ecd msm: sensor: Fix crash when ioctl VIDIOC_MSM_SENSOR_INIT_CFG 8b44a684 msm: camera: Bound check for num_of_stream. 93533f31 ALSA: pcm: prevent UAF in snd_pcm_info 19384322 ANDROID: input: keychord: fix race condition bug c0454215 BACKPORT: FROMLIST: pids: make task_tgid_nr_ns() safe 59c0cd06 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-nyc-mr2-security-next cbd5a934 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10-oc-security-next ad82c662 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-oc 69169ebb Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 bf89a6f2 Revert "Revert "msm: sps: Fix race condition in SPS debugfs APIs"" 1da3ab4f Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-oc 6f8396ea Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 4b958503 UPSTREAM: sctp: do not inherit ipv6_{mc|ac|fl}_list from parent 270bb935 msm: camera: sensor:validating the flash initialization parameters d5481967 compat_qcedev: Fix accessing userspace memory in kernel space 5ff192e2 ASoC: msm: qdsp6v2: add size check to fix out of bounds issue 83366dd9 net: wireless: bcmdhd: add log trace event length check be632ce9 crypto: msm: Fix several race condition issues in crypto drivers a42f6e19 msm: mdss: Increase fbmem buf ref count before use 7489a0a8 msm: mdss: Buffer overflow while processing gamut table data 6b5c59c1 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-nyc-mr2-security-next 49a94690 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10-oc-security-next Linux version 3.10.73-ge40328e12f0 (android- build@vpba25.mtv.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Oct 13 04:03:36 UTC 2017 Bug: 31495866 Bug: 33982955 Bug: 34170483 Bug: 34276203 Bug: 34329758 Bug: 34624167 Bug: 35138888 Bug: 36006779 Bug: 36006981 Bug: 36232584 Bug: 36492827 Bug: 36818836 Bug: 36819059 Bug: 37093119 Bug: 37240993 Bug: 37284397 Bug: 37305633 Bug: 37429972 Bug: 37623773 Bug: 37893116 Bug: 37901413 Bug: 37949660 Bug: 62201221 Bug: 62298712 Bug: 62378232 Bug: 62378962 Bug: 62674846 Bug: 62827928 Bug: 62949902 Bug: 62952032 Bug: 63100473 Bug: 63173776 Bug: 63174519 Bug: 63689921 Bug: 63868933 Bug: 64258073 Bug: 64431967 Bug: 64433362 Bug: 64438726 Bug: 64440043 Bug: 64441352 Bug: 64453105 Bug: 64453422 Bug: 64453423 Bug: 64693751 Bug: 64728950 Bug: 65023233 Bug: 65468973 Bug: 65468975 Bug: 65468993 Bug: 65558908 Bug: 67749245 Change-Id: I937b383fda35bbfa725b7db69dd9cca252118581 Source-Branch: android-msm-angler-3.10-oc Signed-off-by: Steve Pfetsch <spfetsch@google.com>
2017-09-20angler: update kernel prebuiltJohn Dias
am: 7623f100de Change-Id: I24d6310354d84401066ba99dd841c1f92efaf457
2017-09-20angler: update kernel prebuiltJohn Dias
71ff0801 android: binder: Move buffer out of area shared with user space f33a1679 android: binder: Refactor prev and next buffer into a helper function 2d17309c binder: always allocate/map first BINDER_MIN_ALLOC pages 39f2da33 BACKPORT: staging: android: fix missing a blank line after declarations dd08b3c6 UPSTREAM: Staging: Android: removed an unnecessary else statement 765a49f2 UPSTREAM: include/linux/mm.h: add PAGE_ALIGNED() helper Linux version 3.10.73-g71ff0801fe9 (android- build@wphs3.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Sep 20 19:08:44 UTC 2017 Bug: 36007193 Bug: 36727951 Change-Id: If3325f3bade6127c3b65212834b6fad070747397 Source-Branch: android-msm-angler-3.10 Signed-off-by: John Dias <joaodias@google.com>
2017-09-20angler: update kernel prebuiltAndrew Lehmer
am: 119cd99f47 Change-Id: I47e170f21eaf59cc872626dbe8a5590af577a525
2017-09-15angler: update kernel prebuiltAndrew Lehmer
dfa91227 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10 79df07b4 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-oc 4b39d42e Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 77a57c44 net: usb: rmnet_usb_ctrl:Make sure list_head operate atomically 93f53a7c ASoC: msm: qdspv2: add mutex to prevent access same memory simultaneously 9c253523 msm: mdss: hdmi: check up-bound of CEC frame size e13a16c0 msm: camera2: cpp: Fix iommu_attach/detach compat_ioctl issue eaf19c1d UPSTREAM: brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx() dc8f7a19 SoC: msm: audio-effects: return directly to avoid integer overflow 218d3a52 msm: kgsl: Protect the event->handle with spinlock fb50f3fa diag: Add proper synchronization checks to msg mask table 52aa15ae BACKPORT: perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race c5f12b74 cfg80211: Define nla_policy for NL80211_ATTR_LOCAL_MESH_POWER_MODE 568a0573 cfg80211: Check if PMKID attribute is of expected size c46b2ecd msm: sensor: Fix crash when ioctl VIDIOC_MSM_SENSOR_INIT_CFG 8b44a684 msm: camera: Bound check for num_of_stream. 93533f31 ALSA: pcm: prevent UAF in snd_pcm_info 19384322 ANDROID: input: keychord: fix race condition bug c0454215 BACKPORT: FROMLIST: pids: make task_tgid_nr_ns() safe 59c0cd06 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-nyc-mr2-security-next Linux version 3.10.73-gdfa912278a6 (android- build@vpeb2.mtv.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 15 20:28:39 UTC 2017 Bug: 31495866 Bug: 36006779 Bug: 36006981 Bug: 36232584 Bug: 36492827 Bug: 36818836 Bug: 36819059 Bug: 37901413 Bug: 62378962 Bug: 62949902 Bug: 62952032 Bug: 64258073 Bug: 64433362 Bug: 64438726 Bug: 64440043 Bug: 64441352 Bug: 65558908 Change-Id: I1c971c09abe7eeb9175a6ef99c4cd8d3ad410604 Source-Branch: android-msm-angler-3.10 Signed-off-by: Andrew Lehmer <alehmer@google.com>
2017-09-14angler: update kernel prebuiltTodd Poynor
am: f0ffbaef64 Change-Id: I779ffac5fdf76229a32d3ea062b37223ef645980
2017-09-13angler: update kernel prebuiltTodd Poynor
886fec6a BACKPORT: ANDROID: Use sk_uid to replace uid get from socket file 6d56396b ANDROID: Sdcardfs: Move gid derivation under flag 7242617b ANDROID: mnt: Fix freeing of mount data 3b7e7b8d firmware_class: Tie exporting caching routines with CONFIG_CACHE_FW 8d6c7f77 BACKPORT: arm64: cpuinfo: Missing NULL terminator in compat_hwcap_str Linux version 3.10.73-g886fec6a74b (android- build@vpec11.mtv.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Sep 13 22:27:10 UTC 2017 Bug: 37430238 Bug: 37524657 Bug: 38289596 Bug: 63245673 Bug: 65386954 Change-Id: I3e97e8bf273edcb5ef4bfa85d99c8bf37b8b3074 Source-Branch: android-msm-angler-3.10 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2017-09-07angler: update kernel prebuiltAjay Dudani
am: 5ebabf995c Change-Id: I9f2eeb1e8bfdc5c6ad7cf7502c6faed78634612b
2017-09-06angler: update kernel prebuiltAjay Dudani
0a5685c9 firmware_class: make firmware caching configurable Linux version 3.10.73-g0a5685c9934 (android- build@vped13.mtv.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Sep 6 14:59:22 UTC 2017 Bug: 38289596 Change-Id: Ied3aeed2828e518914c79b0b223d264cef39e931 Source-Branch: android-msm-angler-3.10 Signed-off-by: Ajay Dudani <adudani@google.com>
2017-09-06angler: update kernel prebuiltBadhri Jagan Sridharan
am: 48641236f8 Change-Id: I13a2954343c542f0c3bf293d1e7a8d0227fbd77e
2017-09-05angler: update kernel prebuiltBadhri Jagan Sridharan
198a1474 UPSTREAM: USB: cdc-acm: more sanity checking 0cede215 UPSTREAM: USB: iowarrior: fix oops with malicious USB descriptors 62e319d8 UPSTREAM: USB: usb_driver_claim_interface: add sanity checking 863fdec2 UPSTREAM: USB: mct_u232: add sanity checking in probe d77daf76 UPSTREAM: USB: cypress_m8: add endpoint sanity check c8baf786 UPSTREAM: Input: powermate - fix oops with malicious USB descriptors Linux version 3.10.73-g198a14741b8 (android- build@wpdv15.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Sep 5 20:25:27 UTC 2017 Bug: 28242610 Change-Id: Ia6abf72a8bb5b4d2266b4bb9e8861629074e3f67 Source-Branch: android-msm-angler-3.10 Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
2017-08-30angler: update kernel prebuiltShuzhen Wang
am: 16d1615243 Change-Id: Ie130d6a64d18199c36db4f21d4cdf1530315d7bf
2017-08-30angler: update kernel prebuiltShuzhen Wang
665041e1 msm: camera_v2: Increase event timeout ca50eff4 BACKPORT: dm bufio: don't take the lock in dm_bufio_shrink_count 3e9a4d68 BACKPORT: dm bufio: avoid sleeping while holding the dm_bufio lock Linux version 3.10.73-g665041e1632 (android- build@xpce6.ams.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Aug 30 17:31:14 UTC 2017 Bug: 62393979 Bug: 64122284 Change-Id: Ib3bafe11eb4b84fbfa0963d22a6a6c52125c945d Source-Branch: android-msm-angler-3.10 Signed-off-by: Shuzhen Wang <shuzhenwang@google.com>
2017-08-25angler: update kernel prebuiltSteve Pfetsch
am: 3c10d15b90 Change-Id: I12929909fdcd71171236b716d63c9dd8b1f9e7f9
2017-08-24angler: update kernel prebuiltSteve Pfetsch
b696855f msm: kgsl: Add a trace event for the GPU clock 747b2c2b ANDROID: xt_qtaguid: Use sk_callback_lock read locks before reading sk->sk_socket Linux version 3.10.73-gb696855f478 (android- build@vpeb9.mtv.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Thu Aug 24 20:23:28 UTC 2017 Bug: 62789671 Change-Id: Ib31ab9be520f715cb9b9cbee9632017beb93630e Source-Branch: android-msm-angler-3.10 Signed-off-by: Steve Pfetsch <spfetsch@google.com>
2017-08-18angler: update kernel prebuiltAndrew Lehmer
am: 5f6e737e4f Change-Id: I4e1799027654a0f7d4fc248b74ee1075bb803399
2017-08-17angler: update kernel prebuiltAndrew Lehmer
72c4bc96 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10 ad82c662 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-oc 69169ebb Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 bf89a6f2 Revert "Revert "msm: sps: Fix race condition in SPS debugfs APIs"" 8c76dd1d Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10 1da3ab4f Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-oc 6f8396ea Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 4b958503 UPSTREAM: sctp: do not inherit ipv6_{mc|ac|fl}_list from parent 270bb935 msm: camera: sensor:validating the flash initialization parameters d5481967 compat_qcedev: Fix accessing userspace memory in kernel space 5ff192e2 ASoC: msm: qdsp6v2: add size check to fix out of bounds issue 83366dd9 net: wireless: bcmdhd: add log trace event length check be632ce9 crypto: msm: Fix several race condition issues in crypto drivers a42f6e19 msm: mdss: Increase fbmem buf ref count before use 7489a0a8 msm: mdss: Buffer overflow while processing gamut table data 22dd1375 UPSTREAM: arm64: perf: Fix callchain parse error with kernel tracepoint events 560a20f7 UPSTREAM: ARM: 8170/1: Add global named register current_stack_pointer for ARM 2faf622d UPSTREAM: arm64: LLVMLinux: Add current_stack_pointer() for arm64 9c6fc222 UPSTREAM: arm: perf: Fix callchain parse error with kernel tracepoint events 6b5c59c1 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-nyc-mr2-security-next Linux version 3.10.73-g72c4bc96c68 (android- build@wphr4.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Aug 16 15:24:08 UTC 2017 Bug: 34170483 Bug: 37093119 Bug: 37284397 Bug: 37305633 Bug: 37623773 Bug: 37893116 Bug: 37949660 Bug: 62298712 Bug: 62827928 Bug: 63174519 Bug: 64693751 Change-Id: I0b04670c59eff5d1eebe9a19e39a69fc6b4961fe Source-Branch: android-msm-angler-3.10 Signed-off-by: Andrew Lehmer <alehmer@google.com>
2017-08-01angler: update kernel prebuiltSiqi Lin
am: 844f6f3a39 Change-Id: I7795050d84abeb665a7f2985cbf470bc0f58abcf
2017-07-28angler: update kernel prebuiltSiqi Lin
fe989e28 Revert "Revert "BACKPORT: crypto: msm: Fix buffer overflow issue"" f7f8b89f Revert "Revert "msm: sps: Fix race condition in SPS debugfs APIs"" a272401b Revert "Revert "msm: camera: isp: Avoid information leak in ISPIF"" 13907f95 Revert "Revert "msm: sensor: Validationg function pointers before using them"" eef07d77 Revert "Revert "msm: camera: validate num_streams in stream_cfg_cmd before using it"" d584b424 Revert "Revert "dm ioctl: prevent stack leak in dm ioctl call"" 6f8aa828 Revert "Revert "BACKPORT: ALSA: timer: Fix race between read and ioctl"" fa8d9c05 Revert "Revert "UPSTREAM: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT"" cf6b0d95 UPSTREAM: af_key: Fix sadb_x_ipsecrequest parsing ee81fb9d Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10 e5118710 ANDROID: sdcardfs: Remove unnecessary lock 36cc0cc1 Merge branch 'android-msm-angler-3.10-oc' into android-msm-angler-3.10 02cd3599 Add kernel logging for when timerfd_read blocks 66e41497 Make the VTI code compile. Linux version 3.10.73-gfe989e280b3 (android- build@kpfj2.cbf.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Jul 25 22:33:17 UTC 2017 Bug: 33548839 Bug: 35644370 Bug: 36232584 Bug: 37239119 Bug: 37438302 Bug: 38027632 Bug: 38042165 Bug: 62201221 Bug: 63174519 Bug: 63785372 Bug: 63963140 Change-Id: I66cd2a52659e2fca1daadbf9b613d02a0bb6388e Source-Branch: android-msm-angler-3.10 Signed-off-by: Siqi Lin <siqilin@google.com>
2017-07-27angler: update kernel prebuilt[ DO NOT MERGE ] am: 40f3310324 -s ours am: ↵Siqi Lin
db7d3bc7a1 am: b2965453ec am: ec23a43db4 Change-Id: I25b487a6db03e68151f1073e20200e2b94be3e5e
2017-07-27angler: update kernel prebuilt[ DO NOT MERGE ] am: 40f3310324 -s ours am: ↵Siqi Lin
db7d3bc7a1 am: 7a1661d2fb am: f058fd5d33 Change-Id: Ibc3f172a6bd052b9db584d6655b41c162c514308
2017-07-26angler: update kernel prebuilt[ DO NOT MERGE ] am: 40f3310324 -s ours am: ↵android-o-mr1-iot-preview-6o-mr1-iot-preview-6Siqi Lin
db7d3bc7a1 am: b2965453ec Change-Id: I093130ed0530e4476fbd1a56ced65a1471412697
2017-07-26angler: update kernel prebuilt[ DO NOT MERGE ] am: 40f3310324 -s ours am: ↵Siqi Lin
db7d3bc7a1 am: 7a1661d2fb am: a5e350ee7c Change-Id: If6c381e68732aea1e408643d24bc8a14ada3b15f
2017-07-26angler: update kernel prebuilt[ DO NOT MERGE ] am: 40f3310324 -s ours am: ↵Siqi Lin
db7d3bc7a1 am: 7a1661d2fb Change-Id: I7da0a90970d5c446565428371640128d3d861e28
2017-07-26angler: update kernel prebuilt[ DO NOT MERGE ] am: 40f3310324 -s ours am: ↵Siqi Lin
db7d3bc7a1 am: 7a1661d2fb Change-Id: I04e4f482b0d7d8757d8f641a8e32f92c58c439e3
2017-07-26angler: update kernel prebuilt[ DO NOT MERGE ] am: 40f3310324 -s oursSiqi Lin
am: db7d3bc7a1 Change-Id: I66e88877ec849d55273a3ab7992d2e0cf5f6a6a0
2017-07-26angler: update kernel prebuilt[ DO NOT MERGE ] am: 40f3310324 -s oursoreo-dr1-devSiqi Lin
am: db7d3bc7a1 Change-Id: Ie7de991642c3dfe39d674640d522ad3a5332f476
2017-07-26angler: update kernel prebuilt[ DO NOT MERGE ]Siqi Lin
am: 40f3310324 -s ours Change-Id: Ia71adb803405105103f3052e43e794138be51db8
2017-07-26Merge "angler: update kernel prebuilt am: 572b7e0379 am: 417e7888c3" into ↵Siqi Lin
oc-dr1-dev-plus-aosp am: e79e02afa7 Change-Id: I2002110e2b51e3a5704be772f15ab1c9576b089a
2017-07-26angler: update kernel prebuilt am: 572b7e0379 am: 14bf4e422eSiqi Lin
am: 8675f172de Change-Id: I82c5f18f2aedfe50081f1fd7c4532f24a7f69531
2017-07-26angler: update kernel prebuilt am: 572b7e0379 am: 417e7888c3Siqi Lin
am: 0dc2987c29 Change-Id: Ieeae4e5ffecc54c0905d7c2c68d8ebde0db1688d
2017-07-26Merge "angler: update kernel prebuilt am: 572b7e0379 am: 417e7888c3" into ↵Android Build Merger (Role)
oc-dr1-dev-plus-aosp
2017-07-26angler: update kernel prebuilt am: 572b7e0379Siqi Lin
am: 417e7888c3 Change-Id: Ia044c11d8edf41e08ea0632262efcb60304811de
2017-07-26angler: update kernel prebuilt am: 572b7e0379Siqi Lin
am: 417e7888c3 Change-Id: I294f89195f727bd25999db38384e1f6edcb0a8a7
2017-07-26angler: update kernel prebuilt am: 572b7e0379Siqi Lin
am: 14bf4e422e Change-Id: Ic7e3c8087b156348d909e91f7e7b49bf5c50c674
2017-07-26angler: update kernel prebuiltSiqi Lin
am: 572b7e0379 Change-Id: I939b07d28c1ffd7e47e87cc065e2ac1ea076988b
2017-07-26angler: update kernel prebuiltSiqi Lin
am: 572b7e0379 Change-Id: Ia8dc622abf74af50d04651bd272bbfa91b73e8bd
2017-07-24angler: update kernel prebuiltSiqi Lin
10836006 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-oc ff69a6ab Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 62450535 Revert "BACKPORT: crypto: msm: Fix buffer overflow issue" 75c9faea Revert "msm: sps: Fix race condition in SPS debugfs APIs" 995b1a9d Revert "msm: camera: isp: Avoid information leak in ISPIF" e975fb49 Revert "msm: sensor: Validationg function pointers before using them" e72bbd23 Revert "msm: camera: validate num_streams in stream_cfg_cmd before using it" 09f42849 Revert "dm ioctl: prevent stack leak in dm ioctl call" 6353f421 Revert "BACKPORT: ALSA: timer: Fix race between read and ioctl" 1316fe8d Revert "UPSTREAM: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT" 772abc17 Merge branch 'android-msm-angler-3.10-nyc-mr2' into android-msm-angler-3.10-oc 25d4dc26 Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 4f864a51 msm: camera: isp: fix for out of bound access array b46b3d11 ASoC: msm: remove unused msm-compr-q6-v2 ddbd0ffb msm: camera: Allow driver file to be opend only once. df48ee2a soc: qcom: msm_bus: add mutex lock for cllist data 4ac61e37 BACKPORT: ipv6/dccp: do not inherit ipv6_mc_list from parent c58c9355 UPSTREAM: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT 59a480f3 BACKPORT: ALSA: timer: Fix race between read and ioctl 25cce4e9 BACKPORT: ext4: fix data exposure after a crash 1853870b BACKPORT: dccp/tcp: do not inherit mc_list from parent 694af1cf UPSTREAM: mm: fix new crash in unmapped_area_topdown() 07cf73fe BACKPORT: mm: larger stack guard gap, between vmas 80c34750 msm: camera: isp: Handle array out of bounds 5479a3c1 mm: Fix incorrect type conversion for size during dma allocation a8d5056f ASoC: msm: qdsp6v2: extend validation of virtual address 99bc4352 msm: sensor: Validationg function pointers before using them b856d725 UPSTREAM: tcp: avoid infinite loop in tcp_splice_read() 453fafad UPSTREAM: packet: fix races in fanout_add() 5c98138b BACKPORT: ip6_gre: fix ip6gre_err() invalid reads eef1c178 UPSTREAM: mm/mempolicy.c: fix error handling in set_mempolicy and mbind. 08ccf853 net: wireless: bcmdhd: adding boundary check for pfn events 58168423 net: wireless: bcmdhd: Remove "dhd_handle_swc_evt" from dhd. c3fab4bc BACKPORT: crypto: msm: Fix buffer overflow issue 5575ff40 net: wireless: bcmdhd: add boundary check in GSCAN full result handler 68acc6ab net: wireless: bcmdhd: adding boudary check in wl_escan_handler 2935fde9 net: wireless: bcmdhd: adding boundary check in wl_notify_rx_mgmt_frame f35ce58f net: wireless: bcmdhd: add boundary check in dhd_rtt_event_handler 5a6c6240 msm: camera: isp: Avoid information leak in ISPIF 2ae1eab5 msm: camera: fix untrusted pointer for power down setting 8fa7f496 msm: ipa: fix security issues in ipa wan driver 61ff1539 msm:camera: correct stats query out of boundary 3631826a msm: camera: validate num_streams in stream_cfg_cmd before using it 26329473 msm: camera: fix off-by-one overflow in msm_isp_get_bufq 1da242a7 Prevent potential double frees in sg driver 2c451e57 dm ioctl: prevent stack leak in dm ioctl call 1a68951f msm: camera: Fix Use after free bug in msm_vb2.c. d965e968 msm: camera: Use mutex lock to avoid race condition dff69102 msm: sps: Fix race condition in SPS debugfs APIs 230dc021 msm: pcie: add bounds check for debugfs register write 0a95bed9 Merge android-msm-angler-3.10-nyc-mr2 into android-msm-angler-3.10-nyc-mr2-security-next Linux version 3.10.73-g10836006bc5 (android- build@wpds10.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Mon Jul 24 18:00:41 UTC 2017 Bug: 33039685 Bug: 33548839 Bug: 34329758 Bug: 35099636 Bug: 35644370 Bug: 35644812 Bug: 36136563 Bug: 36232584 Bug: 36264696 Bug: 36490777 Bug: 36492827 Bug: 37239119 Bug: 37305578 Bug: 37306719 Bug: 37351060 Bug: 37357704 Bug: 37438302 Bug: 37685267 Bug: 37722328 Bug: 37722970 Bug: 37751399 Bug: 37871211 Bug: 37897645 Bug: 37901268 Bug: 38027632 Bug: 38195131 Bug: 38195738 Bug: 38196031 Bug: 38413813 Bug: 38413975 Bug: 62198330 Bug: 62201221 Bug: 62299478 Bug: 62378596 Bug: 62378684 Bug: 62379475 Bug: 62379525 Bug: 63174519 Change-Id: I64b8dc62155d93aad1d6b61379e76d78ad251e50 Source-Branch: android-msm-angler-3.10-oc Signed-off-by: Siqi Lin <siqilin@google.com>
2017-07-24angler: update kernel prebuilt[ DO NOT MERGE ]Siqi Lin
ff69a6ab Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 62450535 Revert "BACKPORT: crypto: msm: Fix buffer overflow issue" 75c9faea Revert "msm: sps: Fix race condition in SPS debugfs APIs" 995b1a9d Revert "msm: camera: isp: Avoid information leak in ISPIF" e975fb49 Revert "msm: sensor: Validationg function pointers before using them" e72bbd23 Revert "msm: camera: validate num_streams in stream_cfg_cmd before using it" 09f42849 Revert "dm ioctl: prevent stack leak in dm ioctl call" 6353f421 Revert "BACKPORT: ALSA: timer: Fix race between read and ioctl" 1316fe8d Revert "UPSTREAM: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT" 25d4dc26 Merge branch 'android-msm-angler-3.10-nyc-mr2-security-next' into android-msm-angler-3.10-nyc-mr2 4f864a51 msm: camera: isp: fix for out of bound access array b46b3d11 ASoC: msm: remove unused msm-compr-q6-v2 ddbd0ffb msm: camera: Allow driver file to be opend only once. df48ee2a soc: qcom: msm_bus: add mutex lock for cllist data 4ac61e37 BACKPORT: ipv6/dccp: do not inherit ipv6_mc_list from parent c58c9355 UPSTREAM: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT 59a480f3 BACKPORT: ALSA: timer: Fix race between read and ioctl 25cce4e9 BACKPORT: ext4: fix data exposure after a crash 1853870b BACKPORT: dccp/tcp: do not inherit mc_list from parent 694af1cf UPSTREAM: mm: fix new crash in unmapped_area_topdown() 07cf73fe BACKPORT: mm: larger stack guard gap, between vmas 80c34750 msm: camera: isp: Handle array out of bounds 5479a3c1 mm: Fix incorrect type conversion for size during dma allocation a8d5056f ASoC: msm: qdsp6v2: extend validation of virtual address 99bc4352 msm: sensor: Validationg function pointers before using them b856d725 UPSTREAM: tcp: avoid infinite loop in tcp_splice_read() 453fafad UPSTREAM: packet: fix races in fanout_add() 5c98138b BACKPORT: ip6_gre: fix ip6gre_err() invalid reads eef1c178 UPSTREAM: mm/mempolicy.c: fix error handling in set_mempolicy and mbind. 08ccf853 net: wireless: bcmdhd: adding boundary check for pfn events 58168423 net: wireless: bcmdhd: Remove "dhd_handle_swc_evt" from dhd. c3fab4bc BACKPORT: crypto: msm: Fix buffer overflow issue 5575ff40 net: wireless: bcmdhd: add boundary check in GSCAN full result handler 68acc6ab net: wireless: bcmdhd: adding boudary check in wl_escan_handler 2935fde9 net: wireless: bcmdhd: adding boundary check in wl_notify_rx_mgmt_frame f35ce58f net: wireless: bcmdhd: add boundary check in dhd_rtt_event_handler 5a6c6240 msm: camera: isp: Avoid information leak in ISPIF 2ae1eab5 msm: camera: fix untrusted pointer for power down setting 8fa7f496 msm: ipa: fix security issues in ipa wan driver 61ff1539 msm:camera: correct stats query out of boundary 3631826a msm: camera: validate num_streams in stream_cfg_cmd before using it 26329473 msm: camera: fix off-by-one overflow in msm_isp_get_bufq 1da242a7 Prevent potential double frees in sg driver 2c451e57 dm ioctl: prevent stack leak in dm ioctl call 1a68951f msm: camera: Fix Use after free bug in msm_vb2.c. d965e968 msm: camera: Use mutex lock to avoid race condition dff69102 msm: sps: Fix race condition in SPS debugfs APIs 230dc021 msm: pcie: add bounds check for debugfs register write 0a95bed9 Merge android-msm-angler-3.10-nyc-mr2 into android-msm-angler-3.10-nyc-mr2-security-next Linux version 3.10.73-gff69a6ab665 (android- build@wphr3.hot.corp.google.com) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Mon Jul 24 17:58:45 UTC 2017 Bug: 33039685 Bug: 33548839 Bug: 34329758 Bug: 35099636 Bug: 35644370 Bug: 35644812 Bug: 36136563 Bug: 36232584 Bug: 36264696 Bug: 36490777 Bug: 36492827 Bug: 37239119 Bug: 37305578 Bug: 37306719 Bug: 37351060 Bug: 37357704 Bug: 37438302 Bug: 37685267 Bug: 37722328 Bug: 37722970 Bug: 37751399 Bug: 37871211 Bug: 37897645 Bug: 37901268 Bug: 38027632 Bug: 38195131 Bug: 38195738 Bug: 38196031 Bug: 38413813 Bug: 38413975 Bug: 62198330 Bug: 62201221 Bug: 62299478 Bug: 62378596 Bug: 62378684 Bug: 62379475 Bug: 62379525 Bug: 63174519 Change-Id: Iee6dd55d9c2d1ab765d09f86c27318ddf4b47192 Source-Branch: android-msm-angler-3.10-nyc-mr2 Signed-off-by: Siqi Lin <siqilin@google.com>
2017-06-16Merge "angler: update kernel prebuilt am: 6db004cba6 am: 786965ec44" into ↵Tim Murray
oc-dr1-dev-plus-aosp am: 40e0ae52ff Change-Id: I9c1719b0694dc7d23d795eae7403ba7b9c7963a8
2017-06-16angler: update kernel prebuilt am: 6db004cba6 am: 5263f25b19Tim Murray
am: df8d63da12 Change-Id: I4f95e5e2644ac43645e940845a763cda7806bdf5
2017-06-16Merge "angler: update kernel prebuilt am: 6db004cba6 am: 786965ec44" into ↵Android Build Merger (Role)
oc-dr1-dev-plus-aosp