summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-07Merge SQ1A.220205.002android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
Bug: 213904741 Merged-In: Iae3baabe0fbe6f142f1b9b9afc77b10ecb38f4ae Change-Id: I2752f78501ad45f9ca2aed8d2f40065cdf5fdcaa
2022-01-06Merge sc-qpr1 to aosp-master - DO NOT MERGEBill Yi
Merged-In: I7d34391e1cf7e02260433f7f4708e3eb7ec84aec Merged-In: I275c69522adc49df9e82e4f392b68c3d6b0e3db2 Change-Id: I0a696e919befe5e46011a04c2ba38bdcf1f07635
2021-12-16Merge cherrypicks of [16486683] into sc-qpr1-release.android-12.0.0_r28android12-qpr1-releaseAndroid Build Coastguard Worker
Change-Id: I46d3eaf785542508779760604b81516208b5906f
2021-12-16bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ]Eva Huang
Linux version 4.9.279-g5d6ca6be692f-ab8007943 (android- build@abfarm-01183) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Thu Dec 16 11:38:32 UTC 2021 private/msm-google: (4 changes) 5d6ca6be Merge branch 'android-msm-pixel-4.9-sc-security' into android-msm-pixel-4.9-sc-qpr1 120a1354 FROMGIT: USB: gadget: bRequestType is a bitfield, not a enum 22dd0380 UPSTREAM: USB: gadget: zero allocate endpoint 0 buffers 5e81bd23 UPSTREAM: USB: gadget: detect too-big endpoint 0 requests Bug: 208164828 Bug: 210292376 Pick-Prebuilt: 416727161 Build-Id: 8007943 Change-Id: Iae3baabe0fbe6f142f1b9b9afc77b10ecb38f4ae Signed-off-by: Eva Huang <evahuang@google.com> (cherry picked from commit 37f7029710e062f00a3cc441462ff8fed9eaea6f) Merged-In:Iae3baabe0fbe6f142f1b9b9afc77b10ecb38f4ae
2021-12-15Merge cherrypicks of [16404319] into sc-qpr1-release.Android Build Coastguard Worker
Change-Id: I28853782f2f02cd7937fe1822089c7e4fd51b8b8
2021-12-15bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ]Eva Huang
Linux version 4.9.279-gec18edc14e9e-ab7971948 (android- build@abfarm-01585) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Mon Dec 6 09:28:26 UTC 2021 private/msm-google: (4 changes) ec18edc1 Merge branch 'android-msm-pixel-4.9-sc-security' into android-msm-pixel-4.9-sc-qpr1 6968a3f9 FROMGIT: binder: fix test regression due to sender_euid change be8382ca BACKPORT: binder: use cred instead of task for selinux checks e637e810 UPSTREAM: binder: use euid from cred instead of using task Bug: 200688826 Bug: 208164828 Pick-Prebuilt: 414346558 Build-Id: 7971948 Change-Id: Ifb27944ee07f57fd8d297c95445b96650368b306 Signed-off-by: Eva Huang <evahuang@google.com> (cherry picked from commit 65ce72041797947759005ed1f429880bb37bf453) Merged-In:Ifb27944ee07f57fd8d297c95445b96650368b306
2021-12-14Merge Android 12 QPR1Xin Li
Bug: 210511427 Merged-In: I3cb26ae20be7946be34f4b3942eb8b73a4f4737f Change-Id: I6fbcca99dacc51dc59bf75553ed6dc7b6eac8af9
2021-11-24Merge cherrypicks of [16334687] into sc-qpr1-release.android-12.0.0_r26Android Build Coastguard Worker
Change-Id: I4fa0268f4674431ca2e8ec62ff43c9312b511a54
2021-11-24bonito: update kernel-and-modules prebuilt [ DO NOT MERGE ]Eva Huang
Linux version 4.9.279-g6d50a177ad14-ab7943135 (android- build@abfarm-01579) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Wed Nov 24 10:04:17 UTC 2021 private/msm-google: (5 changes) 6d50a177 Merge branch 'android-msm-pixel-4.9-sc-security' into android-msm-pixel-4.9-sc-qpr1 8db13686 ip_gre: add validation for csum_start 86a24127 Merge android-msm-pixel-4.9-sc into android-msm-pixel-4.9-sc-qpr1 90ff73d9 ext4: fix race writing to an inline_data file while its xattrs are changing 0e5e845d google_charger: Persist Temp-Defend OVERHEAT flag across disconnects Bug: 150694665 Bug: 198739053 Bug: 199579676 Bug: 204278431 Pick-Prebuilt: 411986522 Build-Id: 7943135 Change-Id: Iac6b17fa2fafc20deedd4d2b410687f0f110dae2 Signed-off-by: Eva Huang <evahuang@google.com> (cherry picked from commit ca327bff7b34110a3134081263c7f0062094217e) Merged-In:Iac6b17fa2fafc20deedd4d2b410687f0f110dae2
2021-11-15Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918temp_sam_210511427temp-sc-samXin Li
Bug: 205056467 Merged-In: Iff22ccbedad44f55d81786148ab95901e739aa76 Change-Id: I3cb26ae20be7946be34f4b3942eb8b73a4f4737f
2021-11-03Merge SP1A.211105.004 to aosp-master - DO NOT MERGEBill Yi
Merged-In: Id690fcd4d72b9beb7fc605bb35abb208ac0a6bda Merged-In: Idbce42c192de22b917d9335dd9a7509f75cf5fa4 Change-Id: Id7094c688179ab4ddce9e792b85dd92b17525db2
2021-11-02Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGEThe Android Open Source Project
Merged-In: Idbce42c192de22b917d9335dd9a7509f75cf5fa4 Change-Id: Iacaab92a83c6a40a831bc1a1804a74fa7a1e8bd4
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: Id690fcd4d72b9beb7fc605bb35abb208ac0a6bda Change-Id: I9b8e3303ec96da5781a62827911b40f81cd46317
2021-10-06Snap for 7796451 from c3f425f058282836ff81ac67e62a4cbbe3421521 to ↵android-12.0.0_r16Android Build Coastguard Worker
sc-qpr1-release Change-Id: I7572c881595f9fd6dd7bd368df426f8a5095bd27
2021-10-05[automerger skipped] bonito: update kernel-and-modules prebuilt am: ↵Eva Huang
c3f425f058 -s ours am skip reason: Merged-In I1059b8b08b0d19020f86af2c76467a10cae8f2d4 with SHA-1 01b4e53fcd is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15973364 Change-Id: Iff22ccbedad44f55d81786148ab95901e739aa76
2021-10-05bonito: update kernel-and-modules prebuiltEva Huang
Linux version 4.9.279-gda6cb69a608c-ab7793571 (android- build@abfarm-01118) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Tue Oct 5 05:24:16 UTC 2021 private/msm-google: (11 changes) da6cb69a Merge branch 'android-msm-pixel-4.9-sc-security' into android-msm-pixel-4.9-sc-qpr1 76d7cc62 google_charger: Persist Temp-Defend OVERHEAT flag across disconnects 065cc24f usb: max-3421: Prevent corruption of freed memory 2fd2be25 UPSTREAM: netfilter: x_tables: fix pointer leaks to userspace ed037727 msm: adsprpc: Handle UAF in process shell memory 66517de2 msm: adsprpc: Fix race condition in internal_control 3368d315 diag: Sanitize the mempools with pool data size check 3c38dc98 diag: Use valid data_source for a valid token f59bb30c diag: Prevent out of bound write while sending dci pkt to remote 10a10546 ANDROID: xt_quota2: set usersize in xt_match registration object f402e81a ANDROID: xt_quota2: remove trailing junk which might have a digit in it Bug: 120612905 Bug: 187527909 Bug: 190408641 Bug: 195752523 Bug: 195752651 Bug: 196046570 Bug: 196448784 Bug: 198739053 Bug: 199190644 Bug: 199191310 Bug: 200917360 Pick-Prebuilt: 400851091 Build-Id: 7793571 Merged-In: I1059b8b08b0d19020f86af2c76467a10cae8f2d4 Change-Id: Idcc7429ac63852a6dd359b669b1181daa65614be Signed-off-by: Eva Huang <evahuang@google.com>
2021-10-02Snap for 7787524 from 6c8bab6df4680e33b0399561a1a2ce450c6d2048 to ↵Android Build Coastguard Worker
sc-qpr1-release Change-Id: I98e68519d118f3b6da532c257d58b72ecace0581
2021-10-01[automerger skipped] bonito: update kernel-and-modules prebuilt am: ↵Isaac Chiou
6c8bab6df4 -s ours am skip reason: Merged-In I1059b8b08b0d19020f86af2c76467a10cae8f2d4 with SHA-1 01b4e53fcd is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15951606 Change-Id: I82a1e57a9a8dfac6d0eab502f6e20930f3fcad68
2021-10-01bonito: update kernel-and-modules prebuiltIsaac Chiou
Linux version 4.9.279-g49825cc62b0b-ab7782329 (android- build@abfarm-01463) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Thu Sep 30 15:46:39 UTC 2021 private/msm-google: (6 changes) 49825cc6 Merge android-msm-pixel-4.9-sc into android-msm-pixel-4.9-sc-qpr1 d728658b Merge branch 'android-msm-pixel-4.9-sc-security' into android-msm-pixel-4.9-sc bc2e1a82 af_unix: fix garbage collect vs MSG_PEEK ac1de965 net: split out functions related to registering inflight socket files d7ca7237 ANDROID: staging: ion: move buffer kmap from begin/end_cpu_access() 6080095c seq_file: disallow extremely large seq buffer allocations private/msm-google-modules/wlan/fw-api: (1 change) 352d9290 wifi: Add new owners in the OWNERS file. private/msm-google-modules/wlan/qca-wifi-host-cmn: (2 changes) 2ab456c9 qcacmn: Replace WMI_LOGI() with wmi_* appropriate log level cc0a3c53 wifi: Add new owners in the OWNERS file. private/msm-google-modules/wlan/qcacld-3.0: (1 change) cef27c19 wifi: Add new owners in the OWNERS file. Bug: 187527909 Bug: 195082750 Bug: 196926917 Bug: 198391572 Bug: 199223496 Bug: 201604062 Pick-Prebuilt: 399690198 Build-Id: 7782329 Merged-In: I1059b8b08b0d19020f86af2c76467a10cae8f2d4 Change-Id: I78e61c7826e7283e6c462c8f5b652801ba764408 Signed-off-by: Isaac Chiou <isaacchiou@google.com>
2021-09-15Merge cherrypicks of [15831545, 15831526, 15831634, 15831684, 15831293, ↵android-12.0.0_r9android-12.0.0_r8android-12.0.0_r11android-12.0.0_r10android12-s2-releaseandroid12-releaseAndroid Build Coastguard Worker
15831546, 15831847, 15831808, 15831638, 15831639, 15831558, 15831793, 15831794, 15831795, 15831796, 15831797, 15831798, 15831799, 15831800, 15831801, 15831802, 15831803, 15831804, 15831640, 15831849, 15831810, 15831811, 15831850, 15831641, 15831805, 15831812, 15831642, 15831813, 15831851, 15831852, 15831887, 15831888, 15831559, 15831814, 15831815, 15831853, 15831854, 15831855, 15831315] into sc-release Change-Id: Iba374d37881b5db0965f154b65d24176974c4c4b
2021-09-15bonito: update kernel-and-modules prebuiltSecurityBot
Linux version 4.9.270-gd728658b095f-ab7709094 (android- build@abfarm-01471) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Tue Sep 7 06:27:11 UTC 2021 private/msm-google: (5 changes) d728658b Merge branch 'android-msm-pixel-4.9-sc-security' into android-msm-pixel-4.9-sc bc2e1a82 af_unix: fix garbage collect vs MSG_PEEK ac1de965 net: split out functions related to registering inflight socket files d7ca7237 ANDROID: staging: ion: move buffer kmap from begin/end_cpu_access() 6080095c seq_file: disallow extremely large seq buffer allocations Bug: 187527909 Bug: 195082750 Bug: 196926917 Bug: 198391572 Pick-Prebuilt: 394718708 Build-Id: 7709094 Merged-In: If1f782df5756df542545c287c82594f65fd2f04e Change-Id: I8cf3ef1df832fe25010f4f5d6b162da08ee8ab26 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> (cherry picked from commit 1506da2aff46a56666d6ba528e9dbdcde87fbd46)
2021-09-11Snap for 7723257 from d6b381d4a9680d9f5fddf57b9b19c00ad71fc585 to ↵Android Build Coastguard Worker
sc-qpr1-release Change-Id: I072b29062b1c810373c854236b7214359d9dfad6
2021-09-10[automerger skipped] bonito: update kernel-and-modules prebuilt am: ↵SecurityBot
1506da2aff -s ours am: d6b381d4a9 -s ours am skip reason: Merged-In If1f782df5756df542545c287c82594f65fd2f04e with SHA-1 579891bc30 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15774708 Change-Id: I3d9f1a670d4d5390bfdb3ed3488d6017279359e0
2021-09-10[automerger skipped] bonito: update kernel-and-modules prebuilt am: ↵SecurityBot
1506da2aff am: c11f64dd61 -s ours am skip reason: Merged-In If1f782df5756df542545c287c82594f65fd2f04e with SHA-1 579891bc30 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15774708 Change-Id: I09d5dcd85ecb4f990e5dea2277525d29d007c753
2021-09-10[automerger skipped] bonito: update kernel-and-modules prebuilt am: ↵SecurityBot
1506da2aff -s ours am skip reason: Merged-In If1f782df5756df542545c287c82594f65fd2f04e with SHA-1 579891bc30 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15774708 Change-Id: Ib198d0688eb9b73b1bef340fa5e0c0017a5b217d
2021-09-10bonito: update kernel-and-modules prebuilt am: 1506da2affSecurityBot
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15774708 Change-Id: Idbce42c192de22b917d9335dd9a7509f75cf5fa4
2021-09-09bonito: update kernel-and-modules prebuiltSecurityBot
Linux version 4.9.270-gd728658b095f-ab7709094 (android- build@abfarm-01471) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Tue Sep 7 06:27:11 UTC 2021 private/msm-google: (5 changes) d728658b Merge branch 'android-msm-pixel-4.9-sc-security' into android-msm-pixel-4.9-sc bc2e1a82 af_unix: fix garbage collect vs MSG_PEEK ac1de965 net: split out functions related to registering inflight socket files d7ca7237 ANDROID: staging: ion: move buffer kmap from begin/end_cpu_access() 6080095c seq_file: disallow extremely large seq buffer allocations Bug: 187527909 Bug: 195082750 Bug: 196926917 Bug: 198391572 Pick-Prebuilt: 394718708 Build-Id: 7709094 Merged-In: If1f782df5756df542545c287c82594f65fd2f04e Change-Id: I8cf3ef1df832fe25010f4f5d6b162da08ee8ab26 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-08-31Snap for 7688383 from 0fc4733e8407e118d20261534177e369086a3c98 to ↵Android Build Coastguard Worker
sc-qpr1-release Change-Id: I187de9db1fcc9aa5e269d2734d2b46c960c8831f
2021-08-30[automerger skipped] bonito: update kernel-and-modules prebuilt am: ↵Lucas Wei
0fc4733e84 -s ours am skip reason: Merged-In I1059b8b08b0d19020f86af2c76467a10cae8f2d4 with SHA-1 01b4e53fcd is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15688571 Change-Id: I1b660b648e61efa66de858e3ce654e1a6642704d
2021-08-27bonito: update kernel-and-modules prebuiltLucas Wei
Linux version 4.9.279-ga05e95043a32-ab7672416 (android-build@abfarm- east4-028) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm-project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Wed Aug 25 07:50:10 UTC 2021 private/msm-google: (367 changes) a05e9504 LTS: Merge android-4.9-q (4.9.279) into android-msm-pixel-4.9-sc-qpr1 32660d85 misc: access_ramoops: Use memcpy_fromio()/memcpy_toio() 65e47518 Merge android-4.9-q (4.9.279) into android-msm-pixel-4.9-sc-lts 5c3040be Merge 4.9.279 into android-4.9-q 8028d2ce Linux 4.9.279 c67bf898 spi: mediatek: Fix fifo transfer ce223e0c can: raw: raw_setsockopt(): fix raw_rcv panic for sock UAF cbdbd2a8 Revert "Bluetooth: Shutdown controller after workqueues are flushed or cancelled" 57d42738 net: Fix zero-copy head len calculation. a5b9b064 r8152: Fix potential PM refcount imbalance ae7522bf regulator: rt5033: Fix n_voltages settings for BUCK and LDO 9fb9f0b5 btrfs: mark compressed range uptodate only if all bio succeed 0bbfd56f Merge 4.9.278 into android-4.9-q 29bb8b3f Linux 4.9.278 f91217de sis900: Fix missing pci_disable_device() in probe and remove e7500fd7 tulip: windbond-840: Fix missing pci_disable_device() in probe and remove b2076a44 net/mlx5: Fix flow table chaining 52350ddd net: llc: fix skb_over_panic 4c2d0671 mlx4: Fix missing error code in mlx4_load_one() a1d2c2ed tipc: fix sleeping in tipc accept routine 2e3301b4 netfilter: nft_nat: allow to specify layer 4 protocol NAT only 789a3a3c netfilter: conntrack: adjust stop timestamp to real expiry value f6ba5822 cfg80211: Fix possible memory leak in function cfg80211_bss_update 9c2c5bb2 x86/asm: Ensure asm/proto.h can be included stand-alone 6a965e5e nfc: nfcsim: fix use after free during module unload 5c2b6075 NIU: fix incorrect error return, missed in previous revert 9fae312f can: esd_usb2: fix memory leak 22a75d8f can: ems_usb: fix memory leak f61dd3dc can: usb_8dev: fix memory leak fc3f43d5 ocfs2: issue zeroout to EOF blocks 439e209b ocfs2: fix zero out valid data 7e7269ae x86/kvm: fix vcpu-id indexed array sizes aa1b5f2f ARM: ensure the signal page contains defined contents fe0bc3fd lib/string.c: add multibyte memset functions fdf21153 ARM: dts: versatile: Fix up interrupt controller node names e2c06c71 hfs: add lock nesting notation to hfs_find_init 81d6d87a hfs: fix high memory mapping in hfs_bnode_read cb49f4a6 hfs: add missing clean-up in hfs_fill_super 9172d455 sctp: move 198 addresses from unusable to private scope e74d6625 net/802/garp: fix memleak in garp_request_join() 5a08a0cd net/802/mrp: fix memleak in mrp_request_join() 1f63eec1 workqueue: fix UAF in pwq_unbound_release_workfn() a805a7bd af_unix: fix garbage collect vs MSG_PEEK 1f02ba8b net: split out functions related to registering inflight socket files 088f160d tipc: Fix backport of b77413446408fdd256599daf00d5be72b5f3e7c6 6898f8a8 iommu/amd: Fix backport of 140456f994195b568ecd7fc2287a34eadffef3ca 3a77922a Merge 4.9.277 into android-4.9-q edcc1d3a Linux 4.9.277 039f1a72 btrfs: compression: don't try to compress if we don't have enough pages d0526052 iio: accel: bma180: Fix BMA25x bandwidth register values a2f9da29 iio: accel: bma180: Use explicit member assignment 073a417d net: bcmgenet: ensure EXT_ENERGY_DET_MASK is clear c6ddeb63 media: ngene: Fix out-of-bounds bug in ngene_command_config_free_buf() 7db12bae tracing: Fix bug in rb_per_cpu_empty() that might cause deadloop. 040b0ec6 USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick 4002226a USB: serial: cp210x: fix comments for GE CS1000 302b8152 USB: serial: option: add support for u-blox LARA-R6 family f02faae5 usb: renesas_usbhs: Fix superfluous irqs happen after usb_pkt_pop() ae3209b9 usb: max-3421: Prevent corruption of freed memory d17e3dc9 USB: usb-storage: Add LaCie Rugged USB3-FW to IGNORE_UAS 8e82d236 usb: hub: Disable USB 3 device initiated lpm if exit latency is too high 8c46b4b2 KVM: PPC: Book3S: Fix H_RTAS rets buffer overflow 8a563c20 xhci: Fix lost USB 2 remote wake 920595df ALSA: sb: Fix potential ABBA deadlock in CSP driver c1b136b7 s390/ftrace: fix ftrace_update_ftrace_func implementation 2cae2844 Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one" 94764464 proc: Avoid mixing integer types in mem_rw() 63169d19 Revert "USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem" f1e29739 scsi: target: Fix protect handling in WRITE SAME(32) 016c8b8e scsi: iscsi: Fix iface sysfs attr detection a01634bf netrom: Decrease sock refcount when sock timers expire bb154626 net: decnet: Fix sleeping inside in af_decnet 5c6d8e2f net: fix uninit-value in caif_seqpkt_sendmsg 5ca1eb3a s390/bpf: Perform r1 range checking before accessing jit->seen_reg[r1] 42982d02 spi: mediatek: fix fifo rx mode 60d852e1 perf probe-file: Delete namelist in del_events() on the error path e8ca4e96 perf test bpf: Free obj_buf d2bdf75a perf lzma: Close lzma stream on exit bd1a4106 igb: Check if num of q_vectors is smaller than max before array access 715767d4 iavf: Fix an error handling path in 'iavf_probe()' 6ede35a9 e1000e: Fix an error handling path in 'e1000_probe()' 216e3e03 fm10k: Fix an error handling path in 'fm10k_probe()' dced4ada igb: Fix an error handling path in 'igb_probe()' d22d1b79 ixgbe: Fix an error handling path in 'ixgbe_probe()' 012f2c39 ipv6: tcp: drop silly ICMPv6 packet too big messages b3c50b26 tcp: annotate data races around tp->mtu_info b61d327c net: validate lwtstate->data before returning from skb_tunnel_info() c263ae8c net: ti: fix UAF in tlan_remove_one 4d04a42b net: qcom/emac: fix UAF in emac_remove 0cf46cbc net: moxa: fix UAF in moxart_mac_probe 4e5e1467 net: bcmgenet: Ensure all TX/RX queues DMAs are disabled ac4ba372 net: bridge: sync fdb to new unicast-filtering ports 24e3442a net: ipv6: fix return value of ip6_skb_dst_mtu 8adfb5fe sched/fair: Fix CFS bandwidth hrtimer expiry type c1245d5c scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8 0655ac3c rtc: max77686: Do not enforce (incorrect) interrupt trigger type f6d49f66 kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set 092f2c47 thermal/core: Correct function name thermal_zone_device_unregister() 01ddc879 arm64: dts: juno: Update SCPI nodes as per the YAML schema 2bca172b ARM: dts: stm32: fix RCC node name on stm32f429 MCU ad207b09 ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info 5aca74e1 ARM: dts: imx6: phyFLEX: Fix UART hardware flow control dad0441f ARM: dts: BCM63xx: Fix NAND nodes names e71ffd31 ARM: brcmstb: dts: fix NAND nodes names ff87fc5b reset: ti-syscon: fix to_ti_syscon_reset_data macro 4eb19d4e ARM: dts: rockchip: Fix power-controller node names for rk3288 d8beb5e3 ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 90da9cd1 ANDROID: selinux: modify RTM_GETNEIGH{TBL} 94570581 Merge 4.9.276 into android-4.9-q 0db822f6 Linux 4.9.276 c5157b3e seq_file: disallow extremely large seq buffer allocations 8be8d4ba MIPS: vdso: Invalid GIC access through VDSO e1d2758d mips: disable branch profiling in boot/decompress.o 1f546557 mips: always link byteswap helpers into decompressor 63ebf106 scsi: be2iscsi: Fix an error handling path in beiscsi_dev_probe() 84e6245f ARM: dts: am335x: align ti,pindir-d0-out-d1-in property with dt-shema 3b45b8a7 memory: fsl_ifc: fix leak of private memory on probe failure d0d04b95 memory: fsl_ifc: fix leak of IO mapping on probe failure 21badeb6 reset: bail if try_module_get() fails d88da267 ARM: dts: r8a7779, marzen: Fix DU clock names 5061cd55 rtc: fix snprintf() checking in is_rtc_hctosys() cab381c9 ARM: dts: exynos: fix PWM LED max brightness on Odroid XU4 b4b5f265 ARM: dts: exynos: fix PWM LED max brightness on Odroid XU/XU3 66a7bfa9 hexagon: use common DISCARDS macro 6a0661ac ALSA: isa: Fix error return code in snd_cmi8330_probe() 661b521d x86/fpu: Limit xstate copy size in xstateregs_set() 971bc532 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode cef9d9ac nfs: fix acl memory leak of posix_acl_create() ae0d3b65 watchdog: aspeed: fix hardware timeout calculation 558fe7c3 um: fix error return code in winch_tramp() 57fc30d1 um: fix error return code in slip_open() 4f4c9809 power: supply: rt5033_battery: Fix device tree enumeration fb25a515 PCI/sysfs: Fix dsm_label_utf16s_to_utf8s() buffer overrun 9e2b8368 virtio_console: Assure used length from device is limited 102d6bc6 virtio-blk: Fix memory leak among suspend/resume procedure f3a68bfc ACPI: AMBA: Fix resource name in /proc/iomem 7ccf66b8 pwm: tegra: Don't modify HW state in .remove callback b9a9c7d1 power: supply: ab8500: add missing MODULE_DEVICE_TABLE 3a86ea08 power: supply: charger-manager: add missing MODULE_DEVICE_TABLE 58f8bcff ceph: remove bogus checks and WARN_ONs from ceph_set_page_dirty 2307ca3d orangefs: fix orangefs df output. 14540239 x86/fpu: Return proper error codes from user access functions ca96b8ea watchdog: Fix possible use-after-free by calling del_timer_sync() b4565a8a watchdog: sc520_wdt: Fix possible use-after-free in wdt_turnoff() 862f2b5a watchdog: Fix possible use-after-free in wdt_startup() 5429800d ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 7c92116e power: reset: gpio-poweroff: add missing MODULE_DEVICE_TABLE 564b63a6 power: supply: ab8500: Avoid NULL pointers 1f459d80 pwm: spear: Don't modify HW state in .remove callback 03069e44 lib/decompress_unlz4.c: correctly handle zero-padding around initrds. e6e03a91 i2c: core: Disable client irq on reboot/shutdown 3c16e510 ALSA: hda: Add IRQ check for platform_get_irq() e55a793b backlight: lm3630a: Fix return code of .update_status() callback 37fead7c powerpc/boot: Fixup device-tree on little endian 67394861 usb: gadget: hid: fix error return code in hid_bind() dc138ac1 usb: gadget: f_hid: fix endianness issue with descriptors 1e32a592 ALSA: bebob: add support for ToneWeal FW66 38a9a08a ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing() 906a37ab selftests/powerpc: Fix "no_handler" EBB selftest 22edbeca ALSA: ppc: fix error return code in snd_pmac_probe() 88097381 gpio: zynq: Check return value of pm_runtime_get_sync 7c4a0c1e powerpc/ps3: Add dma_mask to ps3_dma_region 7d53f5f9 ALSA: sb: Fix potential double-free of CSP mixer elements b95691fa s390/sclp_vt220: fix console name to match device 6a8183eb mfd: da9052/stmpe: Add and modify MODULE_DEVICE_TABLE 83bd5f16 scsi: iscsi: Add iscsi_cls_conn refcount helpers 1fa1489c fs/jfs: Fix missing error code in lmLogInit() 331f5923 tty: serial: 8250: serial_cs: Fix a memory leak in error handling path a622c5ad scsi: lpfc: Fix "Unexpected timeout" error in direct attach topology e5e9d251 Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro" 29ba8e2b misc/libmasm/module: Fix two use after free in ibmasm_init_one 154dee40 tty: serial: fsl_lpuart: fix the potential risk of division or modulo by zero 74f26d6f fscrypt: don't ignore minor_hash when hash is 0 657df1f0 tracing: Do not reference char * as a string in histograms d2f0b960 scsi: core: Fix bad pointer dereference when ehandler kthread is invalid 7dbeeb70 KVM: X86: Disable hardware breakpoints unconditionally before kvm_x86->run() 5ac7a7b1 KVM: x86: Use guest MAXPHYADDR from CPUID.0x8000_0008 iff TDP is enabled 5f988040 smackfs: restrict bytes count in smk_set_cipso() 745c9a59 jfs: fix GPF in diFree 74b47143 media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K 1402aa0a media: gspca/sunplus: fix zero-length control requests 9451d1bd media: gspca/sq905: fix control-request direction bbc80a97 media: zr364xx: fix memory leak in zr364xx_start_readpipe f1a3aeb0 media: dtv5100: fix control-request directions c1547756 dm btree remove: assign new_root only when removal succeeds f2621620 ipack/carriers/tpci200: Fix a double free in tpci200_pci_probe f2b9f758 seq_buf: Fix overflow in seq_buf_putmem_hex() ac4e4370 power: supply: ab8500: Fix an old bug 35a65504 ipmi/watchdog: Stop watchdog timer when the current action is 'none' 5fd4c6d0 qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute 7c441366 ASoC: tegra: Set driver_name=tegra for all machine drivers 4341d292 ata: ahci_sunxi: Disable DIPM 95a74030 mmc: core: clear flags before allowing to retune 3438609e mmc: sdhci: Fix warning message when accessing RPMB in HS400 mode 427feaf2 pinctrl/amd: Add device HID for new AMD GPIO controller faf519ae powerpc/barrier: Avoid collision with clang's __lwsync macro 54ec4c41 mac80211: fix memory corruption in EAPOL handling 545914a9 can: bcm: delay release of struct bcm_op after synchronize_rcu() 1597aac0 can: gw: synchronize rcu operations before removing gw job entry cfb2abd2 fuse: reject internal errno c7da1d1e sctp: add size validation when walking chunks 0601a2b4 Bluetooth: btusb: fix bt fiwmare downloading failure issue for qca btsoc. dd86afb4 Bluetooth: Shutdown controller after workqueues are flushed or cancelled 345bafc0 Bluetooth: Fix the HCI to MGMT status conversion table e2da8ce2 RDMA/cma: Fix rdma_resolve_route() memory leak d2a28fea wireless: wext-spy: Fix out-of-bounds warning 06538fdc sfc: error code if SRIOV cannot be disabled ce90c3d1 sfc: avoid double pci_remove of VFs 3bfe1550 RDMA/rxe: Don't overwrite errno from ib_umem_get() d2c6d318 atm: nicstar: register the interrupt handler in the right place 8b745964 atm: nicstar: use 'dma_free_coherent' instead of 'kfree' fc5705b2 MIPS: add PMD table accounting into MIPS'pmd_alloc_one 6b3f01b4 cw1200: add missing MODULE_DEVICE_TABLE d3d8b9c9 wl1251: Fix possible buffer overflow in wl1251_cmd_scan 38c4e023 wlcore/wl12xx: Fix wl12xx get_mac error if device is in ELP ecb8d2b6 xfrm: Fix error reporting in xfrm_state_construct. a6414f93 selinux: use __GFP_NOWARN with GFP_NOWAIT in the AVC cf869924 fjes: check return value after calling platform_get_resource() 1a81f53b net: micrel: check return value after calling platform_get_resource() f180bcb5 dm space maps: don't reset space map allocation cursor when committing 4b7812d6 RDMA/cxgb4: Fix missing error code in create_qp() 3fc852e5 ipv6: use prandom_u32() for ID generation 4e59db13 clk: tegra: Ensure that PLLU configuration is applied properly 685bae2c e100: handle eeprom as little endian 371566f6 udf: Fix NULL pointer dereference in udf_symlink function 51a37e9f drm/virtio: Fix double free on probe failure 03aec2c1 reiserfs: add check for invalid 1st journal block 1137d57d net: Treat __napi_schedule_irqoff() as __napi_schedule() on PREEMPT_RT 4e2a0848 atm: nicstar: Fix possible use-after-free in nicstar_cleanup() 54ff3202 mISDN: fix possible use-after-free in HFC_cleanup() a832ee2f atm: iphase: fix possible use-after-free in ia_module_exit() 2d935fb0 hugetlb: clear huge pte during flush function on mips platform 676859ee net: pch_gbe: Use proper accessors to BE data in pch_ptp_match() fe1f45c5 scsi: core: Retry I/O for Notify (Enable Spinup) Required error 26e15e87 mmc: vub3000: fix control-request direction 454f7b43 selftests/vm/pkeys: fix alloc_random_pkey() to make it really, really random 535f6100 mm/huge_memory.c: don't discard hugepage if other processes are mapping it 185ff7de leds: ktd2692: Fix an error handling path c575c543 configfs: fix memleak in configfs_release_bin_file a9bd58aa extcon: max8997: Add missing modalias string 49afe514 extcon: sm5502: Drop invalid register write in sm5502_reg_data 2c4eabe2 phy: ti: dm816x: Fix the error handling path in 'dm816x_usb_phy_probe() 3db36572 scsi: mpt3sas: Fix error return value in _scsih_expander_add() f457e80c of: Fix truncation of memory sizes on 32-bit platforms 51155c79 staging: gdm724x: check for overflow in gdm_lte_netif_rx() 66a36e8a staging: gdm724x: check for buffer overflow in gdm_lte_multi_sdu_pkt() 22e438ab s390: appldata depends on PROC_SYSCTL b695b28b scsi: FlashPoint: Rename si_flags field 00e453af tty: nozomi: Fix the error handling path of 'nozomi_card_init()' a3edd4dd char: pcmcia: error out if 'num_bytes_read' is greater than 4 in set_protocol() 77e90674 Input: hil_kbd - fix error return code in hil_dev_connect() b78d0742 iio: light: tcs3414: Fix buffer alignment in iio_push_to_buffers_with_timestamp() a0c5fd8b iio: light: isl29125: Fix buffer alignment in iio_push_to_buffers_with_timestamp() 382d41f0 iio: prox: pulsed-light: Fix buffer alignment in iio_push_to_buffers_with_timestamp() 58364998 iio: humidity: am2315: Fix buffer alignment in iio_push_to_buffers_with_timestamp() 369b00d2 iio: gyro: bmg160: Fix buffer alignment in iio_push_to_buffers_with_timestamp() 843605ec iio: adc: vf610: Fix buffer alignment in iio_push_to_buffers_with_timestamp() 3d096ee5 iio: adc: ti-ads1015: Fix buffer alignment in iio_push_to_buffers_with_timestamp() 2c19dfca iio: accel: stk8ba50: Fix buffer alignment in iio_push_to_buffers_with_timestamp() ad36a41b iio: accel: stk8312: Fix buffer alignment in iio_push_to_buffers_with_timestamp() 7cc4c2e2 iio: accel: kxcjk-1013: Fix buffer alignment in iio_push_to_buffers_with_timestamp() f36e7834 iio: accel: bma220: Fix buffer alignment in iio_push_to_buffers_with_timestamp() b23c4764 iio: accel: bma180: Fix buffer alignment in iio_push_to_buffers_with_timestamp() 42347670 iio: adis_buffer: do not return ints in irq handlers 157fec4a tty: nozomi: Fix a resource leak in an error handling function 13abbb34 net: sched: fix warning in tcindex_alloc_perfect_hash 91f805f9 writeback: fix obtain a reference to a freeing memcg css 07fc71a4 Bluetooth: mgmt: Fix slab-out-of-bounds in tlv_data_is_valid 0deff99b i40e: Fix error handling in i40e_vsi_open eea7330d vxlan: add missing rcu_read_lock() in neigh_reduce() 3c904eee net: ethernet: ezchip: fix error handling 42ab3cdb net: ethernet: ezchip: fix UAF in nps_enet_remove 5948506e net: ethernet: aeroflex: fix UAF in greth_of_remove f5623bd8 netfilter: nft_exthdr: check for IPv6 packet before further processing 37c723fb netlabel: Fix memory leak in netlbl_mgmt_add_common b3a6c7fa ath10k: Fix an error code in ath10k_add_interface() bea9ce6e brcmsmac: mac80211_if: Fix a resource leak in an error handling path 8693cbc5 wireless: carl9170: fix LEDS build errors & warnings 7302bbf6 drm: qxl: ensure surf.data is ininitialized 8c05661d RDMA/rxe: Fix failure during driver load 04c92096 ehea: fix error return code in ehea_restart_qps() f68ca985 net: pch_gbe: Propagate error from devm_gpio_request_one() 23044e81 ocfs2: fix snprintf() checking a4567b93 ACPI: sysfs: Fix a buffer overrun problem with description_show() 2beea68f crypto: nx - Fix RCU warning in nx842_OF_upd_status 29a5258c spi: spi-sun6i: Fix chipselect/clock bug f1ee56e2 hwmon: (max31790) Fix fan speed reporting for fan7..12 e940b27e hwmon: (max31722) Remove non-standard ACPI device IDs 876e3cae media: s5p-g2d: Fix a memory leak on ctx->fh.m2m_ctx dd4ac8b0 mmc: usdhi6rol0: fix error return code in usdhi6_probe() a9aba474 media: siano: Fix out-of-bounds warnings in smscore_load_firmware_family2() 3bb0edd6 media: tc358743: Fix error return code in tc358743_probe_of() 6951c106 pata_ep93xx: fix deferred probing 1837d67b pata_octeon_cf: avoid WARN_ON() in ata_host_activate() 72aa34cc media: I2C: change 'RST' to "RSET" to fix multiple build errors f6cb1350 pata_rb532_cf: fix deferred probing d89d0b95 sata_highbank: fix deferred probing 175ff4da crypto: ux500 - Fix error return code in hash_hw_final() 824528e3 crypto: ixp4xx - dma_unmap the correct address 057ea05f media: s5p_cec: decrement usage count if disabled 422d1160 ia64: mca_drv: fix incorrect array size calculation 3d6591d0 ACPI: tables: Add custom DSDT file as makefile prerequisite 7f3b28d2 platform/x86: toshiba_acpi: Fix missing error code in toshiba_acpi_setup_keyboard() 2c62eaa6 ACPI: bus: Call kobject_put() in acpi_init() error path cfcb65ad fs: dlm: fix memory leak when fenced fe956b8a random32: Fix implicit truncation warning in prandom_seed_state() 18668145 fs: dlm: cancel work sync othercon df13e556 block_dump: remove block_dump feature in mark_inode_dirty() 6ecad458 ACPI: processor idle: Fix up C-state latency if not ordered 00d11b3c regulator: da9052: Ensure enough delay time for .set_voltage_time_sel 481f9445 btrfs: disable build on platforms having page size 256K c8c6262d btrfs: abort transaction if we fail to update the delayed inode 1be81a9b media: siano: fix device register error path 647701a4 media: dvb_net: avoid speculation from net slot 35e9cf46 crypto: shash - avoid comparing pointers to exported functions under CFI b104a4c5 mmc: via-sdmmc: add a check against NULL pointer dereference c0ecdb5a media: st-hva: Fix potential NULL pointer dereferences 58fff9fb media: bt8xx: Fix a missing check bug in bt878_probe 5f8858f0 media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release 68b18ea6 crypto: qat - remove unused macro in FW loader 7d1b12f5 crypto: qat - check return code of qat_hal_rd_rel_reg() 572ea103 media: pvrusb2: fix warning in pvr2_i2c_core_done 5b1736e6 media: cobalt: fix race condition in setting HPD f0fef765 media: cpia2: fix memory leak in cpia2_usb_probe e4f74537 crypto: nx - add missing MODULE_DEVICE_TABLE a13e2e53 spi: omap-100k: Fix the length judgment problem 76d3d90a spi: spi-topcliff-pch: Fix potential double free in pch_spi_process_messages() d543ce98 spi: spi-loopback-test: Fix 'tx_buf' might be 'rx_buf' 78f27cb4 fuse: check connected before queueing on fpq->io ad63e131 seq_buf: Make trace_seq_putmem_hex() support data longer than 8 1a8bdd35 ssb: sdio: Don't overwrite const buffer if block_write fails b5e35d6d ath9k: Fix kernel NULL pointer dereference during ath_reset_internal() 5069d075 serial_cs: remove wrong GLOBETROTTER.cis entry 46f0339b serial_cs: Add Option International GSM-Ready 56K/ISDN modem 768d6db0 serial: sh-sci: Stop dmaengine transfer in sci_stop_tx() 29037aef iio: ltr501: ltr501_read_ps(): add missing endianness conversion 1c04d7fd iio: ltr501: ltr559: fix initialization of LTR501_ALS_CONTR 830b34d7 iio: ltr501: mark register holding upper 8 bits of ALS_DATA{0,1} and PS_DATA as volatile, too b033ed39 s390/cio: dont call css_wait_for_slow_path() inside a lock cec2cc04 SUNRPC: Should wake up the privileged task firstly. a08048fd SUNRPC: Fix the batch tasks count wraparound. 7c6ae37a ext4: fix avefreec in find_group_orlov 8c5136e3 ext4: remove check for zero nr_to_scan in ext4_es_scan() d77d29f4 ext4: correct the cache_nr in tracepoint ext4_es_shrink_exit 25dcc64f ext4: fix kernel infoleak via ext4_extent_header f1b6e445 btrfs: clear defrag status of a root if starting transaction fails 7fb8719b ARM: dts: at91: sama5d4: fix pinctrl muxing f3673f6f Input: joydev - prevent use of not validated data in JSIOCSBTNMAP ioctl c027848a iov_iter_fault_in_readable() should do nothing in xarray case b0dfe924 ntfs: fix validity check for file name attribute a4509571 USB: cdc-acm: blacklist Heimann USB Appset device 8e275d3d usb: gadget: eem: fix echo command packet response issue df85e5cf net: can: ems_usb: fix use-after-free in ems_usb_disconnect() cb44739e Input: usbtouchscreen - fix control-request directions 6b57361d media: dvb-usb: fix wrong definition c143cf01 ALSA: usb-audio: fix rate on Ozone Z90 USB headset e19c1bf5 Merge 4.9.275 into android-4.9-q e0c3e706 Linux 4.9.275 01df0e31 xen/events: reset active flag for lateeoi events later 5d27e150 kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync() 392cfdd6 kthread_worker: split code for canceling the delayed work timer 22226752 drm/nouveau: fix dma_address check for CPU/GPU sync 8b289e6d scsi: sr: Return appropriate error code when disk is ejected c52e6f64 mm, futex: fix shared futex pgoff on shmem huge page 07cc82b9 mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split 2b123e35 mm: add VM_WARN_ON_ONCE_PAGE() macro 88a899fa include/linux/mmdebug.h: make VM_WARN* non-rvals Bug: 169763055 Bug: 171572148 Bug: 192901071 Bug: 196282886 Pick-Prebuilt: 393224179 Build-Id: 7672416 Merged-In: I1059b8b08b0d19020f86af2c76467a10cae8f2d4 Change-Id: I88ce1415241a745397694ded9e1964dbb240c8be Signed-off-by: Lucas Wei <lucaswei@google.com>
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I0e6757991098b2174d9024a612bd60ca6c623567 Change-Id: Id690fcd4d72b9beb7fc605bb35abb208ac0a6bda
2021-08-14Snap for 7641961 from 579891bc30fa4e810b718c68e65ec9177940885f to ↵Android Build Coastguard Worker
sc-qpr1-release Change-Id: I966c226277568f83623c47696a63ae704d82dc65
2021-08-13bonito: update kernel-and-modules prebuilt am: 579891bc30Lucas Wei
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15531059 Change-Id: Ic89268848526631b400f3a6f7f8c2929b3b7e4ea
2021-08-12bonito: update kernel-and-modules prebuiltLucas Wei
Linux version 4.9.274-g05e51c5f7a82-ab7634490 (android-build@abfarm- us-east1-c-0085) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Thu Aug 12 01:59:35 UTC 2021 private/msm-google: (222 changes) 05e51c5f LTS: Merge android-4.9-q (4.9.274) into android-msm-pixel-4.9-sc-qpr1 023f3585 Merge android-4.9-q (4.9.274) into android-msm-pixel-4.9-sc-lts 54b5f551 Merge 4.9.274 into android-4.9-q ebeed1e3 Linux 4.9.274 f6b3e679 i2c: robotfuzz-osif: fix control-request directions 46c38e25 nilfs2: fix memory leak in nilfs_sysfs_delete_device_group 7d1419f8 net: ll_temac: Avoid ndo_start_xmit returning NETDEV_TX_BUSY b84996d9 net: qed: Fix memcpy() overflow of qed_dcbx_params() ab0e9c45 r8169: Avoid memcpy() over-reading of ETH_SS_STATS 402197b8 sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS b0564937 r8152: Avoid memcpy() over-reading of ETH_SS_STATS 7ecce7aa net/packet: annotate accesses to po->ifindex a619ce14 net/packet: annotate accesses to po->bind 45a99589 net: caif: fix memory leak in ldisc_open 7a442d4c inet: annotate date races around sk->sk_txhash d34f5f23 ping: Check return value of function 'ping_queue_rcv_skb' 76217396 mac80211: drop multicast fragments d3a0d82d cfg80211: call cfg80211_leave_ocb when switching away from OCB ee0e5601 mac80211: remove warning in ieee80211_get_sband() 97f70933 Revert "PCI: PM: Do not read power state in pci_enable_device_flags()" 36cee5f5 arm64: perf: Disable PMU while processing counter overflows fd66d5a4 Makefile: Move -Wno-unused-but-set-variable out of GCC only block 65518354 ARM: 9081/1: fix gcc-10 thumb2-kernel regression eba9c6d5 i40e: Be much more verbose about what we can and cannot offload 0889f0a3 inet: use bigger hash table for IP ID generation 39a44ae4 x86/fpu: Reset state for all signal restore failures 54657108 tracing: Do not stop recording comms if the trace file is being read 46ac8f9c tracing: Do not stop recording cmdlines when tracing is off ff4c63f3 usb: dwc3: core: fix kernel panic when do reboot 1cdfaab8 can: bcm/raw/isotp: use per module netdevice notifier 4eeac8e8 net: fec_ptp: add clock rate zero check f87e5a93 dmaengine: pl330: fix wrong usage of spinlock flags in dma_cyclc 2f0969c0 PCI: Mark some NVIDIA GPUs to avoid bus reset d71d3362 PCI: Mark TI C667X to avoid bus reset 9627a9f3 tracing: Do no increment trace_clock_global() by one d240a283 can: bcm: fix infoleak in struct bcm_msg_head 9d704cd5 radeon: use memcpy_to/fromio for UVD fw upload d9a6a265 scsi: core: Put .shost_dev in failure path if host state changes to RUNNING 1cafc540 net: ethernet: fix potential use-after-free in ec_bhf_remove 14184ec5 net: cdc_eem: fix tx fixup skb leak 3942d0f9 net: hamradio: fix memory leak in mkiss_close f4bbeaa6 be2net: Fix an error handling path in 'be_probe()' a1461c0d net/af_unix: fix a data-race in unix_dgram_sendmsg / unix_release_sock 0dc13e75 net: ipv4: fix memory leak in ip_mc_add1_src 64160d17 net: usb: fix possible use-after-free in smsc75xx_bind 4c3522ea net: cdc_ncm: switch to eth%d interface naming 1afb8d0c netxen_nic: Fix an error handling path in 'netxen_nic_probe()' 1d512465 qlcnic: Fix an error handling path in 'qlcnic_probe()' cc10a229 net: stmmac: dwmac1000: Fix extended MAC address registers definition 3666061c alx: Fix an error handling path in 'alx_probe()' 576c1526 netfilter: synproxy: Fix out of bounds when parsing TCP options 159554cb rtnetlink: Fix regression in bridge VLAN configuration e3c36c77 udp: fix race between close() and udp_abort() 423c6939 net: rds: fix memory leak in rds_recvmsg 086e92b1 net: ipv4: fix memory leak in netlbl_cipsov4_add_std 6031daaa batman-adv: Avoid WARN_ON timing related checks 3c5c213e mm: hwpoison: change PageHWPoison behavior on hugetlb pages ffcf4e92 dmaengine: stedma40: add missing iounmap() on error in d40_probe() 4d64fd91 dmaengine: QCOM_HIDMA_MGMT depends on HAS_IOMEM f39f2841 fib: Return the correct errno code adfe9159 net: Return the correct errno code e7a5c17a net/x25: Return the correct errno code c468f608 rtnetlink: Fix missing error code in rtnl_bridge_notify() 48e4c0d4 net: ipconfig: Don't override command-line hostnames or domains 09362c6c ethernet: myri10ge: Fix missing error code in myri10ge_probe() 02c1b02b scsi: target: core: Fix warning on realtime kernels 92869945 gfs2: Fix use-after-free in gfs2_glock_shrink_scan 71c7e555 HID: gt683r: add missing MODULE_DEVICE_TABLE 7d2054b4 ARM: OMAP2+: Fix build warning when mmc_omap is not built 41b1e71a HID: usbhid: fix info leak in hid_submit_ctrl 5b7c9258 HID: Add BUS_VIRTUAL to hid_connect logging bd786771 HID: hid-sensor-hub: Return error for hid_set_field() failure 1f957419 net: ieee802154: fix null deref in parse dev addr 83cacca6 FROMGIT: bpf: Do not change gso_size during bpf_skb_change_proto() b3bf8228 Merge 4.9.273 into android-4.9-q 94ac998a Linux 4.9.273 b08854de proc: only require mm_struct for writing edcce01e tracing: Correct the length check which causes memory corruption 4aedc2bc ftrace: Do not blindly read the ip address in ftrace_bug() b66107bf scsi: core: Only put parent device if host state differs from SHOST_CREATED 8958181c scsi: core: Fix error handling of scsi_host_alloc() f80f193f NFSv4: nfs4_proc_set_acl needs to restore NFS_CAP_UIDGID_NOMAP on error. ea1d322c kvm: fix previous commit for 32-bit builds 32943db3 perf session: Correct buffer copying when peeking events a979e601 NFS: Fix a potential NULL dereference in nfs_get_client() 0c78dc6c perf: Fix data race between pin_count increment/decrement fd24be23 usb: fix various gadget panics on 10gbps cabling beb1e67a usb: fix various gadgets null ptr deref on 10gbps cabling. 1cf7c5a2 usb: gadget: eem: fix wrong eem header operation 0309bae4 USB: serial: quatech2: fix control-request directions 07aebfc5 USB: serial: omninet: add device id for Zyxel Omni 56K Plus e1072949 USB: serial: ftdi_sio: add NovaTech OrionMX product ID 60156089 usb: dwc3: ep0: fix NULL pointer exception 376b5d45 USB: f_ncm: ncm_bitrate (speed) is unsigned 0e3481c7 cgroup1: don't allow '\n' in renaming 9a27493e btrfs: return value from btrfs_mark_extent_written() in case of error 74062130 kvm: avoid speculation-based attacks from out-of-range memslot accesses 8e250a13 drm: Lock pointer access in drm_master_release() 074f408a i2c: mpc: implement erratum A-004447 workaround cef2dfdf i2c: mpc: Make use of i2c_recover_bus() ff9b9756 powerpc/fsl: set fsl,i2c-erratum-a004447 flag for P1010 i2c controllers 48ad312a powerpc/fsl: set fsl,i2c-erratum-a004447 flag for P2041 i2c controllers 256ed97b bnx2x: Fix missing error code in bnx2x_iov_init_one() 0cc12a28 MIPS: Fix kernel hang under FUNCTION_GRAPH_TRACER and PREEMPT_TRACER e84620e8 net: appletalk: cops: Fix data race in cops_probe1 b931f035 net: macb: ensure the device is available before accessing GEMGXL control registers 0083215d scsi: target: qla2xxx: Wait for stop_phase1 at WWN removal a68bcfe6 scsi: vmw_pvscsi: Set correct residual data length f77d9c0c net/qla3xxx: fix schedule while atomic in ql_sem_spinlock a8f2c7bb wq: handle VM suspension in stall detection 3fd1a1a5 cgroup: disable controllers at parse time f88144a7 net: mdiobus: get rid of a BUG_ON() a8e9111a netlink: disable IRQs for netlink_lock_table() e7e1ef6a bonding: init notify_work earlier to avoid uninitialized use 4c1fcb6e isdn: mISDN: netjet: Fix crash in nj_probe: df40de3d ASoC: sti-sas: add missing MODULE_DEVICE_TABLE d6a21a3f net/nfc/rawsock.c: fix a permission check bug 63ac7652 proc: Track /proc/$pid/attr/ opener mm_struct 6c5d14c2 Merge 4.9.272 into android-4.9-q d98bf8b9 Linux 4.9.272 a12c2d8e xen-pciback: redo VF placement in the virtual topology 61a912d5 arm64: Remove unimplemented syscall log message 124d79bb KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode 1eee552f bnxt_en: Remove the setting of dev_port. 7a7ccd02 btrfs: fixup error handling in fixup_inode_link_counts 247dcb0f btrfs: fix error handling in btrfs_del_csums 39c15bd2 nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect 33e03ada ocfs2: fix data corruption by fallocate f86c8051 pid: take a reference when initializing `cad_pid` 5b3a9a2b ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed bc7892c3 ALSA: timer: Fix master timer notification 81afc61c net: caif: fix memory leak in cfusbl_device_notify 9348c1f1 net: caif: fix memory leak in caif_device_notify 4f6da6c5 net: caif: add proper error handling 9eb4fd7f net: caif: added cfserl_release function 3c62132d Bluetooth: use correct lock to prevent UAF of hdev object 75aa7baa Bluetooth: fix the erroneous flush_work() order 6ddb0131 ieee802154: fix error return code in ieee802154_llsec_getparams() 0dcf3f88 ieee802154: fix error return code in ieee802154_add_iface() bae62325 netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches bd010b8c HID: i2c-hid: fix format string mismatch b9d2aec6 HID: pidff: fix error return code in hid_pidff_init() 24b12c13 ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service 80c30777 vfio/platform: fix module_put call in error flow f48d16bc vfio/pci: zap_vma_ptes() needs MMU 0a84e9a3 vfio/pci: Fix error return code in vfio_ecap_init() fc0138fa efi: cper: fix snprintf() use in cper_dimm_err_location() 0b30423c efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared 7246d9cf net: usb: cdc_ncm: don't spew notifications 19233c89 Merge 4.9.271 into android-4.9-q d0291f71 Linux 4.9.271 6be6810e usb: core: reduce power-on-good delay time of root hub 96f7d5fd hugetlbfs: hugetlb_fault_mutex_hash() cleanup 4b556b05 MIPS: ralink: export rt_sysc_membase for rt2880_wdt.c 427951f2 MIPS: alchemy: xxs1500: add gpio-au1000.h header file 1359954a sch_dsmark: fix a NULL deref in qdisc_reset() b196cb89 scsi: libsas: Use _safe() loop in sas_resume_port() dbecbe0e ASoC: cs35l33: fix an error code in probe() d1e3380e staging: emxx_udc: fix loop in _nbu2ss_nuke() 17728616 mld: fix panic in mld_newpack() d9b085fb net: bnx2: Fix error return code in bnx2_init_board() 9cdaafff net: mdio: octeon: Fix some double free issues 7c22f00e net: mdio: thunder: Fix a double free issue in the .remove function ea0555b9 net: netcp: Fix an error message 3293cf35 drm/amdgpu: Fix a use-after-free 540ff213 platform/x86: intel_punit_ipc: Append MODULE_DEVICE_TABLE for ACPI e934c4ee btrfs: do not BUG_ON in link_to_fixup_dir c156a75f openrisc: Define memory barrier mb ac17128f scsi: BusLogic: Fix 64-bit system enumeration error for Buslogic 1e5435a0 media: gspca: properly check for errors in po1030_probe() c6b9e21d media: dvb: Add check on sp8870_readreg return 7d57a4bf libertas: register sysfs groups properly 498e73d3 dmaengine: qcom_hidma: comment platform_driver_register call 4866a55d isdn: mISDNinfineon: check/cleanup ioremap failure correctly in setup_io 3300c2c5 char: hpet: add checks after calling ioremap daa36b28 net: caif: remove BUG_ON(dev == NULL) in caif_xmit 6dbf1101 net: fujitsu: fix potential null-ptr-deref 27d75d2e serial: max310x: unregister uart driver in case of failure and abort 5a92efd5 platform/x86: hp_accel: Avoid invoking _INI to speed up resume 6d95e8d5 perf jevents: Fix getting maximum number of fds 09c9e79f i2c: i801: Don't generate an interrupt on bus reset e4d63ca7 i2c: s3c2410: fix possible NULL pointer deref on read message after write 5489f30b tipc: skb_linearize the head skb when reassembling msgs 9d8a165f Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv" 82cb1779 net/mlx4: Fix EEPROM dump support fa59cebd NFSv4: Fix v4.0/v4.1 SEEK_DATA return -ENOTSUPP when set NFS_V4_2 config b291baae NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce() b287521e NFS: fix an incorrect limit in filelayout_decode_layout() 77c55940 Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails 8bf96425 spi: Fix use-after-free with devm_spi_alloc_* 22c84059 net: usb: fix memory leak in smsc75xx_bind 13d26ab9 USB: serial: pl2303: add device id for ADLINK ND-6530 GC 48b56a0f USB: serial: ftdi_sio: add IDs for IDS GmbH Products b3a4c93a USB: serial: option: add Telit LE910-S1 compositions 0x7010, 0x7011 28a8369a USB: serial: ti_usb_3410_5052: add startech.com device id c697244c serial: rp2: use 'request_firmware' instead of 'request_firmware_nowait' 3f9cf968 USB: trancevibrator: fix control-request direction 62556a72 iio: adc: ad7793: Add missing error code in ad7793_setup() 3cd5f508 staging: iio: cdc: ad7746: avoid overwrite of num_channels 8fff0b53 mei: request autosuspend after sending rx flow control 7889c70e misc/uss720: fix memory leak in uss720_probe 41794e31 kgdb: fix gcc-11 warnings harder 1f314bbd dm snapshot: properly fix a crash when an origin has no snapshots e71e366d ath10k: Validate first subframe of A-MSDU before processing the list 9a1bb171 mac80211: extend protection against mixed key and fragment cache attacks 5551cb1c mac80211: do not accept/forward invalid EAPOL frames 43a65c7e mac80211: prevent attacks on TKIP/WEP as well d0f613fe mac80211: check defrag PN against current frame 03b07ec6 mac80211: add fragment cache to sta_info fb2bc761 mac80211: drop A-MSDUs on old ciphers 81bcb7d7 cfg80211: mitigate A-MSDU aggregation attacks 56eeeb79 mac80211: properly handle A-MSDUs that start with an RFC 1042 header bb474664 mac80211: prevent mixed key and fragment cache attacks 29bc5b2b mac80211: assure all fragments are encrypted e410dd4f net: hso: fix control-request directions 3cfc8ca6 proc: Check /proc/$pid/attr/ writes against file opener 4e1ba532 NFSv4: Fix a NULL pointer dereference in pnfs_mark_matching_lsegs_return() 4a621621 NFC: nci: fix memory leak in nci_allocate_device e2a2d6c9 netfilter: x_tables: Use correct memory barriers. 62383ec6 scripts: switch explicitly to Python 3 2d1f7c92 tweewide: Fix most Shebang lines 13dd6bb4 mm, vmstat: drop zone->lock in /proc/pagetypeinfo Bug: 188690383 Bug: 192901071 Bug: 192919066 Pick-Prebuilt: 390275757 Build-Id: 7634490 Merged-In: I077f1b65ab9282a166f9237753b298f88703d3ce Change-Id: If1f782df5756df542545c287c82594f65fd2f04e Signed-off-by: Lucas Wei <lucaswei@google.com>
2021-08-11Snap for 7629638 from f2300668c6a43ee4b85322220269e65da4d93fdc to ↵Android Build Coastguard Worker
sc-qpr1-release Change-Id: I19c536c620037bf91a73f5f40e37565fce501f46
2021-08-07Snap for 7620055 from f2300668c6a43ee4b85322220269e65da4d93fdc to sc-releaseandroid-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-cts-12.0_r1android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r1android12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s1-releaseAndroid Build Coastguard Worker
Change-Id: I7ec169700515c541ab4941876e5fdfc7644c4d97
2021-08-06bonito: update kernel-and-modules prebuilt am: f2300668c6SecurityBot
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15473117 Change-Id: I0e6757991098b2174d9024a612bd60ca6c623567
2021-08-05bonito: update kernel-and-modules prebuiltandroid12-devSecurityBot
Linux version 4.9.270-g862f51bac900-ab7613625 (android- build@abfarm-01193) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Thu Aug 5 07:29:46 UTC 2021 private/msm-google: (1 change) 862f51ba google_charger: clear overheat status in bd_reset private/msm-google-modules/wlan/qcacld-3.0: (1 change) 93bd2df2 qcacld-3.0: Fix integer underflow in assoc response frame Bug: 193070701 Bug: 194447426 Pick-Prebuilt: 388946192 Build-Id: 7613625 Change-Id: Ifd4235ce1fec843a14dfa1a8e91e0abf87e83a9e Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-08-03DO NOT MERGE - Merge RQ3A.210805.001.A1.android-s-beta-5android-s-beta-5Xin Li
Bug: 192585466 Merged-In: I384915c6699cdf66ea2ba24791f139edd8788d14 Change-Id: Ib0bbcf897b5bf8c5414de565fc9d74cd9c757608
2021-07-31Snap for 7599941 from af1d705ac18e01b88b8d99612bdec74d99c59977 to sc-releaseAndroid Build Coastguard Worker
Change-Id: Ibb13fe63e65210101f5208188fd30e6f8bea11e7
2021-07-30bonito: update kernel-and-modules prebuilt am: af1d705ac1Wilson Sung
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15390816 Change-Id: I4b6d3804a6457cfcd0cbd51808bbb6a1cec7755d
2021-07-27bonito: update kernel-and-modules prebuiltWilson Sung
Linux version 4.9.270-gfb9b4412a237-ab7577833 (android- build@abfarm007) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Fri Jul 23 16:41:55 UTC 2021 private/msm-google: (6 changes) fb9b4412 google_charger: disable temp-defend 1ce9d812 google_charger: BD parameters reset condition fix 1d5b736e max1720x_battery: correct return value in irq function 6ab7fc7c google_charger: bd_clear for reset temp-defend data 34ca4a4c max1720x_battery: report hot when JEITA trigger b5d8da34 smb-lib: report hot when JEITA trigger Bug: 184199846 Bug: 188237845 Bug: 192712475 Bug: 192921867 Bug: 194393180 Pick-Prebuilt: 386540752 Build-Id: 7577833 Change-Id: I0b718966eb5b9557ac9307d9aac731daa24dfd39 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2021-07-12Merge RQ3A.210705.001 to aosp-master - DO NOT MERGEBill Yi
Merged-In: I127c371a17d647d6c2f4b9841566795e6a2f9053 Merged-In: I70b3bf79061646b38e5cdda0afb99376ca07356c Merged-In: I70b3bf79061646b38e5cdda0afb99376ca07356c Change-Id: I70c4ea98227a0996b317c5d10fc6f0355b940015
2021-07-12Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: I70b3bf79061646b38e5cdda0afb99376ca07356c Merged-In: I617b2bd368d291a34814d56a9f369b28feeba762 Change-Id: I869583f7731f0ec749035b0de9b15d459188caa3
2021-07-06Snap for 7524638 from 67e3d0fdfa4a325627a59e207cc20af421817467 to sc-releaseAndroid Build Coastguard Worker
Change-Id: I1804889d3c7944dabe268797519daa9a462edc0e
2021-07-05bonito: update kernel-and-modules prebuilt am: 67e3d0fdfaIsaac Chiou
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15206396 Change-Id: I617b2bd368d291a34814d56a9f369b28feeba762
2021-07-05bonito: update kernel-and-modules prebuiltIsaac Chiou
Linux version 4.9.270-gc51c7b10ee52-ab7522847 (android- build@abfarm253) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm- project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Mon Jul 5 01:55:12 UTC 2021 private/msm-google: (2 changes) c51c7b10 usb: new attributes implementation to enable/disable usb data 78793192 FROMGIT: net: cdc_ncm: switch to eth%d interface naming private/msm-google-modules/wlan/qcacld-3.0: (2 changes) 187ef758 Revert "qcacmn: Enqueue scan request only after scan scheduling is success" 4198debd qcacld-3.0: Avoid buffer overflow in llstats debugfs response Bug: 181923048 Bug: 184613044 Bug: 187605433 Bug: 189164671 Test: Wifi Regression Test Pick-Prebuilt: 378949967 Build-Id: 7522847 Change-Id: I450ba2c842711f8e4b4d13a1cd07be540732261f Signed-off-by: Isaac Chiou <isaacchiou@google.com>
2021-07-03Snap for 7519874 from f04f7262e3acf7ce2217ed331e2434e0a8ece74f to sc-releaseAndroid Build Coastguard Worker
Change-Id: I2aeba101a6ebf32cc4a4f75062522d33c8f9f099
2021-07-02bonito: Initial Commit kernel-and-modules prebuilt am: f04f7262e3Wilson Sung
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito-kernel/+/15172160 Change-Id: I3f095ded6b40ef98f4e00209bab3f185590bba58
2021-07-02bonito: Initial Commit kernel-and-modules prebuiltWilson Sung
Initial Commit @ 74df458c0c7b98c33f9b92578660102fa8a70b5e Linux version 4.9.270-g0720cd639d20-ab7512330 (android-build@abfarm-east4-089) (Android (7284624, based on r416183b) clang version 12.0.5 (https://android.googlesource.com/toolchain/llvm-project c935d99d7cf2016289302412d708641d52d2f7ee)) #0 SMP PREEMPT Thu Jul 1 08:02:59 UTC 2021 Pick-Prebuilt: 378949967 Bug: 191842017 Change-Id: I308c67ced3e091a2f327a73bce45706a05725317 Signed-off-by: Wilson Sung <wilsonsung@google.com>