Mark Rutland
8adfaec154
BACKPORT: arm64: mm: kfence: only handle translation faults
...
Alexander noted that KFENCE only expects to handle faults from invalid page
table entries (i.e. translation faults), but arm64's fault handling logic will
call kfence_handle_page_fault() for other types of faults, including alignment
faults caused by unaligned atomics. This has the unfortunate property of
causing those other faults to be reported as "KFENCE: use-after-free",
which is misleading and hinders debugging.
Fix this by only forwarding unhandled translation faults to the KFENCE
code, similar to what x86 does already.
Alexander has verified that this passes all the tests in the KFENCE test
suite and avoids bogus reports on misaligned atomics.
Bug: 254441685
Link: https://lore.kernel.org/all/20221102081620.1465154-1-zhongbaisong@huawei.com/
Fixes: 840b239863mark.rutland@arm.com >
Reviewed-by: Alexander Potapenko <glider@google.com >
Tested-by: Alexander Potapenko <glider@google.com >
Cc: Catalin Marinas <catalin.marinas@arm.com >
Cc: Marco Elver <elver@google.com >
Cc: Will Deacon <will@kernel.org >
Link: https://lore.kernel.org/r/20221114104411.2853040-1-mark.rutland@arm.com
Signed-off-by: Will Deacon <will@kernel.org >
(cherry picked from commit 0bb1fbffc6joneslee@google.com >
Change-Id: I317bb3ca1db362f3a3befa2e97c76d71f1edc770
2023-04-13 07:58:37 +01:00
SeongJae Park
d11c3f780c
UPSTREAM: mm/damon/dbgfs: check if rm_contexts input is for a real context
...
A user could write a name of a file under 'damon/' debugfs directory,
which is not a user-created context, to 'rm_contexts' file. In the case,
'dbgfs_rm_context()' just assumes it's the valid DAMON context directory
only if a file of the name exist. As a result, invalid memory access
could happen as below. Fix the bug by checking if the given input is for
a directory. This check can filter out non-context inputs because
directories under 'damon/' debugfs directory can be created via only
'mk_contexts' file.
This bug has found by syzbot[1].
[1] https://lore.kernel.org/damon/000000000000ede3ac05ec4abf8e@google.com/
Bug: 254441685
Link: https://lkml.kernel.org/r/20221107165001.5717-2-sj@kernel.org
Fixes: 75c1c2b53csj@kernel.org >
Reported-by: syzbot+6087eafb76a94c4ac9eb@syzkaller.appspotmail.com
Cc: <stable@vger.kernel.org > [5.15.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
(cherry picked from commit 1de09a7281joneslee@google.com >
Change-Id: I038612db15c0a46089a5e1a52a4750fff6ba3bf6
2023-04-13 07:58:36 +01:00
Peter Xu
8eb30a41f5
UPSTREAM: mm/shmem: use page_mapping() to detect page cache for uffd continue
...
mfill_atomic_install_pte() checks page->mapping to detect whether one page
is used in the page cache. However as pointed out by Matthew, the page
can logically be a tail page rather than always the head in the case of
uffd minor mode with UFFDIO_CONTINUE. It means we could wrongly install
one pte with shmem thp tail page assuming it's an anonymous page.
It's not that clear even for anonymous page, since normally anonymous
pages also have page->mapping being setup with the anon vma. It's safe
here only because the only such caller to mfill_atomic_install_pte() is
always passing in a newly allocated page (mcopy_atomic_pte()), whose
page->mapping is not yet setup. However that's not extremely obvious
either.
For either of above, use page_mapping() instead.
Bug: 254441685
Link: https://lkml.kernel.org/r/Y2K+y7wnhC4vbnP2@x1n
Fixes: 153132571fpeterx@redhat.com >
Reported-by: Matthew Wilcox <willy@infradead.org >
Cc: Andrea Arcangeli <aarcange@redhat.com >
Cc: Hugh Dickins <hughd@google.com >
Cc: Axel Rasmussen <axelrasmussen@google.com >
Cc: <stable@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
(cherry picked from commit 93b0d91787joneslee@google.com >
Change-Id: I5635ee1a81087e8022169ad1bda1e6d98fe5835f
2023-04-13 07:58:36 +01:00
Thinh Nguyen
f74be44246
UPSTREAM: usb: dwc3: gadget: Don't delay End Transfer on delayed_status
...
The gadget driver may wait on the request completion when it sets the
USB_GADGET_DELAYED_STATUS. Make sure that the End Transfer command can
go through if the dwc->delayed_status is set so that the request can
complete. When the delayed_status is set, the Setup packet is already
processed, and the next phase should be either Data or Status. It's
unlikely that the host would cancel the control transfer and send a new
Setup packet during End Transfer command. But if that's the case, we can
try again when ep0state returns to EP0_SETUP_PHASE.
Bug: 254441685
Fixes: e1ee843488stable@vger.kernel.org
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Link: https://lore.kernel.org/r/3f9f59e5d74efcbaee444cf4b30ef639cc7b124e.1666146954.git.Thinh.Nguyen@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 4db0fbb601joneslee@google.com >
Change-Id: I308536a4d5482c838a1b75c84a1e1127e43f3b95
2023-04-13 07:58:36 +01:00
Michael Ellerman
37b3a6153f
UPSTREAM: powerpc/64: Include cache.h directly in paca.h
...
paca.h uses ____cacheline_aligned without directly including cache.h,
where it's defined.
For Book3S builds that's OK because paca.h includes lppaca.h, and it
does include cache.h.
But Book3E builds have been getting cache.h indirectly via printk.h,
which is dicey, and in fact that include was recently removed, leading
to build errors such as:
ld: fs/isofs/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned'; fs/isofs/namei.o:(.bss+0x0): first defined here
So include cache.h directly to fix the build error.
Bug: 254441685
Fixes: 534aa1dc97linux@roeck-us.net >
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au >
(cherry picked from commit dcf280e6f8joneslee@google.com >
Change-Id: Id94536f14e3705b90bf12f6c61f59b96de3c994a
2023-04-13 07:58:36 +01:00
Lv Ruyi
3815eca894
UPSTREAM: firmware: tegra: Fix error application of sizeof() to pointer
...
Application of sizeof() to pointer yields the number of bytes of the
pointer, but it should use the length of buffer in the code.
Bug: 254441685
Fixes: 06c2d9a078zealci@zte.com.cn >
Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn >
Reviewed-by: Jon Hunter <jonathanh@nvidia.com >
Tested-by: Jon Hunter <jonathanh@nvidia.com >
Signed-off-by: Thierry Reding <treding@nvidia.com >
(cherry picked from commit 711e26c00ejoneslee@google.com >
Change-Id: Ide1f9cbc31fea6fbb1d74f7ad4bbb6bef7caa0a9
2023-04-13 07:58:36 +01:00
Harry Wentland
1b3cfadf63
BACKPORT: drm/amd/display: Allocate structs needed by dcn_bw_calc_rq_dlg_ttu in pipe_ctx
...
[Why & How]
dcn_bw_calc_rq_dlg_ttu uses a stack frame great than 1024. To solve this
we could allocate the rq_param, dlg_sys_param, and input structs
dynamically. Since this function is inside a kernel_fpu_begin()/end()
call we want to avoid memory allocation. Instead it's much
safer to pre-allocate these on the pipe_ctx.
Bug: 254441685
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Fixes: 3fe617ccafndesaulniers@google.com >
Cc: Linus Torvalds <torvalds@linux-foundation.org >
Cc: amd-gfx@lists.freedesktop.org
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org >
Cc: Arnd Bergmann <arnd@kernel.org >
Cc: Leo Li <sunpeng.li@amd.com >
Cc: Alex Deucher <alexander.deucher@amd.com >
Cc: Christian König <christian.koenig@amd.com >
Cc: Xinhui Pan <Xinhui.Pan@amd.com >
Cc: Nathan Chancellor <nathan@kernel.org >
Cc: Guenter Roeck <linux@roeck-us.net >
Cc: llvm@lists.linux.dev
Acked-by: Christian König <christian.koenig@amd.com >
Build-tested-by: Nathan Chancellor <nathan@kernel.org >
Reviewed-by: Leo Li <sunpeng.li@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
(cherry picked from commit 1f2fcc8183joneslee@google.com >
Change-Id: I667857207b3bdcdc8eebb87a043fc4d5bf008d4d
2023-04-13 07:58:36 +01:00
Harry Wentland
3fafe0740e
BACKPORT: drm/amd/display: Pass display_pipe_params_st as const in DML
...
[Why]
This neither needs to be on the stack nor passed by value
to each function call. In fact, when building with clang
it seems to break the Linux's default 1024 byte stack
frame limit.
[How]
We can simply pass this as a const pointer.
This patch fixes these Coverity IDs
Addresses-Coverity-ID: 1424031: ("Big parameter passed by value")
Addresses-Coverity-ID: 1423970: ("Big parameter passed by value")
Addresses-Coverity-ID: 1423941: ("Big parameter passed by value")
Addresses-Coverity-ID: 1451742: ("Big parameter passed by value")
Addresses-Coverity-ID: 1451887: ("Big parameter passed by value")
Addresses-Coverity-ID: 1454146: ("Big parameter passed by value")
Addresses-Coverity-ID: 1454152: ("Big parameter passed by value")
Addresses-Coverity-ID: 1454413harry.wentland@amd.com >
Fixes: 3fe617ccafndesaulniers@google.com >
Cc: Linus Torvalds <torvalds@linux-foundation.org >
Cc: amd-gfx@lists.freedesktop.org
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org >
Cc: Arnd Bergmann <arnd@kernel.org >
Cc: Leo Li <sunpeng.li@amd.com >
Cc: Alex Deucher <alexander.deucher@amd.com >
Cc: Christian König <christian.koenig@amd.com >
Cc: Xinhui Pan <Xinhui.Pan@amd.com >
Cc: Nathan Chancellor <nathan@kernel.org >
Cc: Guenter Roeck <linux@roeck-us.net >
Cc: llvm@lists.linux.dev
Acked-by: Christian König <christian.koenig@amd.com >
Build-tested-by: Nathan Chancellor <nathan@kernel.org >
Reviewed-by: Leo Li <sunpeng.li@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
(cherry picked from commit 22667e6ec6joneslee@google.com >
Change-Id: Ie9846bf0e5dd330cafa811afbb896f0bdb70c85d
2023-04-13 07:58:36 +01:00
Peifeng Li
61344663df
ANDROID: clear memory trylock-bit when page_locked.
...
Clearing trylock-bit of page shrinked by shrnk_page_list in advance
which avoids page in other scene with the trylock-bit.
The page with trylock-bit will be added ret_pages and handled in
trace_android_vh_handle_failed_page_trylock. In the progress[unlock_page, handled],
the page carried with trylock-bit will cause some error-issues in other
scene, so clear trylock-bit here.
trace_android_vh_page_trylock_get_result will clear trylock-bit and return
if page tyrlock failed in reclaim-process. Here we just want to clear
trylock-bit so that ignore page_trylock_result.
Fixes: 309a6bf81a20 ("ANDROID: vendor_hook: Add hook to not be stuck ro rmap lock in kswapd or direct_reclaim")
Bug: 240003372
Signed-off-by: Peifeng Li <lipeifeng@oppo.com >
Change-Id: Ifecd308573ef37a51e33856a0b3bb93cd67289ac
2023-04-12 15:05:56 +08:00
Ye Bin
d55931c1cc
UPSTREAM: ext4: fix kernel BUG in 'ext4_write_inline_data_end()'
...
commit 5c099c4fdc#1 ] PREEMPT SMP KASAN
CPU: 1 PID: 3629 Comm: syz-executor212 Not tainted 6.1.0-rc5-syzkaller-00018-g59d0d52c30d4 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022
RIP: 0010:ext4_write_inline_data+0x344/0x3e0 fs/ext4/inline.c:227
RSP: 0018:ffffc90003b3f368 EFLAGS: 00010293
RAX: 0000000000000000 RBX: ffff8880704e16c0 RCX: 0000000000000000
RDX: ffff888021763a80 RSI: ffffffff821e31a4 RDI: 0000000000000006
RBP: 000000000006818e R08: 0000000000000006 R09: 0000000000068199
R10: 0000000000000079 R11: 0000000000000000 R12: 000000000000000b
R13: 0000000000068199 R14: ffffc90003b3f408 R15: ffff8880704e1c82
FS: 000055555723e3c0(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fffe8ac9080 CR3: 0000000079f81000 CR4: 0000000000350ee0
Call Trace:
<TASK>
ext4_write_inline_data_end+0x2a3/0x12f0 fs/ext4/inline.c:768
ext4_write_end+0x242/0xdd0 fs/ext4/inode.c:1313
ext4_da_write_end+0x3ed/0xa30 fs/ext4/inode.c:3063
generic_perform_write+0x316/0x570 mm/filemap.c:3764
ext4_buffered_write_iter+0x15b/0x460 fs/ext4/file.c:285
ext4_file_write_iter+0x8bc/0x16e0 fs/ext4/file.c:700
call_write_iter include/linux/fs.h:2191 [inline]
do_iter_readv_writev+0x20b/0x3b0 fs/read_write.c:735
do_iter_write+0x182/0x700 fs/read_write.c:861
vfs_iter_write+0x74/0xa0 fs/read_write.c:902
iter_file_splice_write+0x745/0xc90 fs/splice.c:686
do_splice_from fs/splice.c:764 [inline]
direct_splice_actor+0x114/0x180 fs/splice.c:931
splice_direct_to_actor+0x335/0x8a0 fs/splice.c:886
do_splice_direct+0x1ab/0x280 fs/splice.c:974
do_sendfile+0xb19/0x1270 fs/read_write.c:1255
__do_sys_sendfile64 fs/read_write.c:1323 [inline]
__se_sys_sendfile64 fs/read_write.c:1309 [inline]
__x64_sys_sendfile64+0x1d0/0x210 fs/read_write.c:1309
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x63/0xcd
---[ end trace 0000000000000000 ]---
Above issue may happens as follows:
ext4_da_write_begin
ext4_da_write_inline_data_begin
ext4_da_convert_inline_data_to_extent
ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
ext4_da_write_end
ext4_run_li_request
ext4_mb_prefetch
ext4_read_block_bitmap_nowait
ext4_validate_block_bitmap
ext4_mark_group_bitmap_corrupted(sb, block_group, EXT4_GROUP_INFO_BBITMAP_CORRUPT)
percpu_counter_sub(&sbi->s_freeclusters_counter,grp->bb_free);
-> sbi->s_freeclusters_counter become zero
ext4_da_write_begin
if (ext4_nonda_switch(inode->i_sb)) -> As freeclusters_counter is zero will return true
*fsdata = (void *)FALL_BACK_TO_NONDELALLOC;
ext4_write_begin
ext4_da_write_end
if (write_mode == FALL_BACK_TO_NONDELALLOC)
ext4_write_end
if (inline_data)
ext4_write_inline_data_end
ext4_write_inline_data
BUG_ON(pos + len > EXT4_I(inode)->i_inline_size);
-> As inode is already convert to extent, so 'pos + len' > inline_size
-> then trigger BUG.
To solve this issue, instead of checking ext4_has_inline_data() which
is only cleared after data has been written back, check the
EXT4_STATE_MAY_INLINE_DATA flag in ext4_write_end().
Fixes: f19d5870cbsyzbot+4faa160fa96bfba639f8@syzkaller.appspotmail.com
Reported-by: Jun Nie <jun.nie@linaro.org >
Signed-off-by: Ye Bin <yebin10@huawei.com >
Link: https://lore.kernel.org/r/20221206144134.1919987-1-yebin@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Cc: stable@kernel.org
[ta: Fix conflict in if expression and use the local variable inline_data
as it is initialized with ext4_has_inline_data(inode) anyway.]
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 257756238
Change-Id: Ifc77db2f12db2270a2f7100e548e113dee3ee492
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-04-05 12:46:44 +00:00
Wei Liu
08ccb44bff
ANDROID: GKI: Update symbols to symbol list
...
Update symbols to symbol list externed by oppo network group.
2 Added functions:
[A] 'function sock* __udp4_lib_lookup(net*, __be32, __be16, __be32, __be16, int, int, udp_table*, sk_buff*)'
[A] 'function sock* __udp6_lib_lookup(net*, const in6_addr*, __be16, const in6_addr*, __be16, int, int, udp_table*, sk_buff*)'
1 Added variable:
[A] 'udp_table udp_table'
Bug: 193384408
Change-Id: I11069764b442ce935facb5283f0b3b3494e2846c
Signed-off-by: Wei Liu <liuwei.a@oppo.com >
2023-04-05 00:32:30 +00:00
Paul Lawrence
faf3626b8e
ANDROID: incremental fs: Evict inodes before freeing mount data
...
Since evicting inodes triggers writes to the backing file, which uses
the mi_owner field from the mount_info struct, make sure inodes are
evicted before we free the mount_info data
Test: incfs_test
Bug: 270117845
Change-Id: I673b2e0e04b5adc3998caf6f22443598a30338af
Signed-off-by: Paul Lawrence <paullawrence@google.com >
(cherry picked from commit 7899985277
2023-04-04 15:48:57 +00:00
Baolin Wang
b7b3a636ad
UPSTREAM: mm: memcontrol: set the correct memcg swappiness restriction
...
Since commit c843966c55https://lkml.kernel.org/r/d77469b90c45c49953ccbc51e54a1d465bc18f70.1627626255.git.baolin.wang@linux.alibaba.com
Fixes: c843966c55baolin.wang@linux.alibaba.com >
Acked-by: Michal Hocko <mhocko@suse.com >
Cc: Johannes Weiner <hannes@cmpxchg.org >
Cc: Vladimir Davydov <vdavydov.dev@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
Bug: 275726149
(cherry picked from commit 37bc3cb9bbcarlosgalo@google.com >
2023-04-03 18:51:57 +00:00
Duoming Zhou
3ea370605a
UPSTREAM: media: rc: Fix use-after-free bugs caused by ene_tx_irqsim()
...
[ Upstream commit 29b0589a86sean@mess.org >
Bug: 272747251
Fixes: 9ea53b74dfduoming@zju.edu.cn >
Signed-off-by: Sean Young <sean@mess.org >
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org >
Signed-off-by: Sasha Levin <sashal@kernel.org >
Signed-off-by: Lee Jones <joneslee@google.com >
Change-Id: I0076055ed3336b6f2ef4afe8afe68620dc6c2a0a
2023-04-03 10:46:38 +01:00
Todd Kjos
d88cd5c7f0
ANDROID: Fix kernelci break: eventfd_signal_mask redefined
...
Fix a merge issue where eventfd_signal_mask() was added twice which
resulted in kernelci issues when !CONFIG_EVENTFD:
include/linux/eventfd.h:76:19: error: redefinition of ‘eventfd_signal_mask’
Fixes: 4ef66581d7tkjos@google.com >
Change-Id: Ifdd212e857c2ff76c75283e77b9978e51a96d178
2023-03-31 19:23:38 +00:00
Eric Biggers
2a7aed7298
ANDROID: dm-default-key: update for blk_crypto_evict_key() returning void
...
blk_crypto_evict_key() now returns void, so update default_key_dtr()
accordingly.
Bug: 270098322
Change-Id: I6add49a8f792c51f33e7adb189a9e7ed5ff410b0
Signed-off-by: Eric Biggers <ebiggers@google.com >
2023-03-29 20:05:47 +00:00
Eric Biggers
0dad2818cb
BACKPORT: FROMGIT: blk-crypto: make blk_crypto_evict_key() more robust
...
If blk_crypto_evict_key() sees that the key is still in-use (due to a
bug) or that ->keyslot_evict failed, it currently just returns while
leaving the key linked into the keyslot management structures.
However, blk_crypto_evict_key() is only called in contexts such as inode
eviction where failure is not an option. So actually the caller
proceeds with freeing the blk_crypto_key regardless of the return value
of blk_crypto_evict_key().
These two assumptions don't match, and the result is that there can be a
use-after-free in blk_crypto_reprogram_all_keys() after one of these
errors occurs. (Note, these errors *shouldn't* happen; we're just
talking about what happens if they do anyway.)
Fix this by making blk_crypto_evict_key() unlink the key from the
keyslot management structures even on failure.
Also improve some comments.
Fixes: 1b26283970stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com >
Reviewed-by: Christoph Hellwig <hch@lst.de >
Link: https://lore.kernel.org/r/20230315183907.53675-2-ebiggers@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk >
Bug: 270098322
(cherry picked from commit 5c7cb94452https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/log/?h=for-next )
Change-Id: I4e8983ad7db94ea8cd422743196da8854adda552
Signed-off-by: Eric Biggers <ebiggers@google.com >
2023-03-29 20:05:47 +00:00
Eric Biggers
b3926f1a34
BACKPORT: FROMGIT: blk-crypto: make blk_crypto_evict_key() return void
...
blk_crypto_evict_key() is only called in contexts such as inode eviction
where failure is not an option. So there is nothing the caller can do
with errors except log them. (dm-table.c does "use" the error code, but
only to pass on to upper layers, so it doesn't really count.)
Just make blk_crypto_evict_key() return void and log errors itself.
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com >
Reviewed-by: Christoph Hellwig <hch@lst.de >
Link: https://lore.kernel.org/r/20230315183907.53675-2-ebiggers@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk >
Bug: 270098322
(cherry picked from commit 70493a63bahttps://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/log/?h=for-next )
Change-Id: I8b9c7a74473e21fb740f021ac9f2fff95f986aa4
Signed-off-by: Eric Biggers <ebiggers@google.com >
2023-03-29 20:05:47 +00:00
Eric Biggers
e7bfca1670
BACKPORT: FROMGIT: blk-mq: release crypto keyslot before reporting I/O complete
...
Once all I/O using a blk_crypto_key has completed, filesystems can call
blk_crypto_evict_key(). However, the block layer currently doesn't call
blk_crypto_put_keyslot() until the request is being freed, which happens
after upper layers have been told (via bio_endio()) the I/O has
completed. This causes a race condition where blk_crypto_evict_key()
can see 'slot_refs != 0' without there being an actual bug.
This makes __blk_crypto_evict_key() hit the
'WARN_ON_ONCE(atomic_read(&slot->slot_refs) != 0)' and return without
doing anything, eventually causing a use-after-free in
blk_crypto_reprogram_all_keys(). (This is a very rare bug and has only
been seen when per-file keys are being used with fscrypt.)
There are two options to fix this: either release the keyslot before
bio_endio() is called on the request's last bio, or make
__blk_crypto_evict_key() ignore slot_refs. Let's go with the first
solution, since it preserves the ability to report bugs (via
WARN_ON_ONCE) where a key is evicted while still in-use.
Fixes: a892c8d52cstable@vger.kernel.org
Reviewed-by: Nathan Huckleberry <nhuck@google.com >
Reviewed-by: Christoph Hellwig <hch@lst.de >
Signed-off-by: Eric Biggers <ebiggers@google.com >
Link: https://lore.kernel.org/r/20230315183907.53675-2-ebiggers@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk >
Bug: 270098322
(cherry picked from commit 9cd1e56667https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/log/?h=for-next )
Change-Id: Ic2c2426db7693a06901c7893d481471f30de03b2
Signed-off-by: Eric Biggers <ebiggers@google.com >
2023-03-29 20:05:47 +00:00
Matthias Schiffer
469e02cc6d
BACKPORT: of: base: Skip CPU nodes with "fail"/"fail-..." status
...
Allow fully disabling CPU nodes using status = "fail".
This allows a bootloader to change the number of available CPUs (for
example when a common DTS is used for SoC variants with different numbers
of cores) without deleting the nodes altogether, which could require
additional fixups to avoid dangling phandle references.
Unknown status values (everything that is not "okay"/"ok", "disabled" or
"fail"/"fail-...") will continue to be interpreted like "disabled",
meaning that the CPU can be enabled during boot.
References:
- https://www.spinics.net/lists/devicetree-spec/msg01007.html
- https://github.com/devicetree-org/dt-schema/pull/61
Bug: 275500667
Change-Id: I0d0028c1d5f529c43f184556ac661c50fe026741
Link: https://lore.kernel.org/all/CAL_Jsq+1LsTBdVaODVfmB0eme2jMpNL4VgKk-OM7rQWyyF0Jbw@mail.gmail.com/
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com >
Tested-by: Sai Prakash Ranjan <quic_saipraka@quicinc.com >
Reviewed-by: Frank Rowand <frank.rowand@sony.com >
Link: https://lore.kernel.org/r/20211122114536.2981-1-matthias.schiffer@ew.tq-group.com
Signed-off-by: Rob Herring <robh@kernel.org >
(cherry picked from commit 4fdd0736a3quic_kbajaj@quicinc.com >
2023-03-29 16:45:54 +00:00
Pietro Borrello
e0d8206f5d
UPSTREAM: hid: bigben_probe(): validate report count
...
[ Upstream commit b94335f899256a90ed9eborrello@diag.uniroma1.it >
Link: https://lore.kernel.org/r/20230211-bigben-oob-v1-1-d2849688594c@diag.uniroma1.it
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com >
Signed-off-by: Sasha Levin <sashal@kernel.org >
Signed-off-by: Lee Jones <joneslee@google.com >
Change-Id: I575c5d4c8a63a2065752a45c47b23cf725cc57ae
2023-03-29 15:04:53 +01:00
Pietro Borrello
7fd7972fc1
UPSTREAM: HID: bigben: use spinlock to safely schedule workers
...
[ Upstream commit 76ca8da9894eb1b01de5borrello@diag.uniroma1.it >
Link: https://lore.kernel.org/r/20230125-hid-unregister-leds-v4-3-7860c5763c38@diag.uniroma1.it
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com >
Signed-off-by: Sasha Levin <sashal@kernel.org >
Signed-off-by: Lee Jones <joneslee@google.com >
Change-Id: Ia3f47b68264f6c492597b0b0603f6822dc624f2b
2023-03-29 15:04:44 +01:00
Pietro Borrello
1bba06f3e8
UPSTREAM: HID: bigben_worker() remove unneeded check on report_field
...
[ Upstream commit 27d2a2fd84918aa1ef10c7bf714f87918aa1ef10borrello@diag.uniroma1.it >
Link: https://lore.kernel.org/r/20230125-hid-unregister-leds-v4-2-7860c5763c38@diag.uniroma1.it
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com >
Signed-off-by: Sasha Levin <sashal@kernel.org >
Signed-off-by: Lee Jones <joneslee@google.com >
Change-Id: Ide36490e2e4482f6cf9af931bef052f172419e31
2023-03-29 15:04:36 +01:00
Pietro Borrello
aaffce1ef4
UPSTREAM: HID: bigben: use spinlock to protect concurrent accesses
...
[ Upstream commit 9fefb6201c256a90ed9eborrello@diag.uniroma1.it >
Link: https://lore.kernel.org/r/20230125-hid-unregister-leds-v4-1-7860c5763c38@diag.uniroma1.it
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com >
Signed-off-by: Sasha Levin <sashal@kernel.org >
Signed-off-by: Lee Jones <joneslee@google.com >
Change-Id: I8b7a34cba4c79c26f3d1912c97a83820d88bd5a4
2023-03-29 15:04:17 +01:00
Jiantao Zhang
d1d2d17fe9
BACKPORT: USB: gadget: Fix use-after-free during usb config switch
...
In the process of switching USB config from rndis to other config,
if the hardware does not support the ->pullup callback, or the
hardware encounters a low probability fault, both of them may cause
the ->pullup callback to fail, which will then cause a system panic
(use after free).
The gadget drivers sometimes need to be unloaded regardless of the
hardware's behavior.
Analysis as follows:
=======================================================================
(1) write /config/usb_gadget/g1/UDC "none"
gether_disconnect+0x2c/0x1f8
rndis_disable+0x4c/0x74
composite_disconnect+0x74/0xb0
configfs_composite_disconnect+0x60/0x7c
usb_gadget_disconnect+0x70/0x124
usb_gadget_unregister_driver+0xc8/0x1d8
gadget_dev_desc_UDC_store+0xec/0x1e4
(2) rm /config/usb_gadget/g1/configs/b.1/f1
rndis_deregister+0x28/0x54
rndis_free+0x44/0x7c
usb_put_function+0x14/0x1c
config_usb_cfg_unlink+0xc4/0xe0
configfs_unlink+0x124/0x1c8
vfs_unlink+0x114/0x1dc
(3) rmdir /config/usb_gadget/g1/functions/rndis.gs4
panic+0x1fc/0x3d0
do_page_fault+0xa8/0x46c
do_mem_abort+0x3c/0xac
el1_sync_handler+0x40/0x78
0xffffff801138f880
rndis_close+0x28/0x34
eth_stop+0x74/0x110
dev_close_many+0x48/0x194
rollback_registered_many+0x118/0x814
unregister_netdev+0x20/0x30
gether_cleanup+0x1c/0x38
rndis_attr_release+0xc/0x14
kref_put+0x74/0xb8
configfs_rmdir+0x314/0x374
If gadget->ops->pullup() return an error, function rndis_close() will be
called, then it will causes a use-after-free problem.
=======================================================================
Fixes: 0a55187a1ewater.zhangjiantao@huawei.com >
Signed-off-by: TaoXue <xuetao09@huawei.com >
Link: https://lore.kernel.org/r/20221121130805.10735-1-water.zhangjiantao@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 273510696
Bug: 275027942
Change-Id: I702f324c5852d3b2448081b092fef464f8691989
(cherry picked from commit afdc12887fraychi@google.com >
2023-03-28 12:57:14 +00:00
Suren Baghdasaryan
976d98e9aa
ANDROID: ABI: Add page_pinner_inited into symbols list
...
Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 1 Added variable
1 Added variable:
[A] 'static_key_false page_pinner_inited'
Bug: 273138535
Change-Id: I0de904601a8b99029b6deb06833fd1570860031d
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2023-03-23 14:09:02 -07:00
Suren Baghdasaryan
16c2b1d94f
ANDROID: page_pinner: prevent pp_buffer access before initialization
...
If page_pinner is configured with page_pinner_enabled=false and
failure_tracking=true, pp_buffer will be accessed without being
initialized. Prevent this by adding page_pinner_inited checks in
functions that access it.
Fixes: 898cfbf094a2 ("ANDROID: mm: introduce page_pinner")
Bug: 259024332
Bug: 260179017
Change-Id: I8f612cae3e74d36e8a4eee5edec25281246cbe5e
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
(cherry picked from commit 23fb3111f63e5fe239a769668275c20493a5849c)
2023-03-23 13:28:36 -07:00
Laurent Vivier
cd1d9c42a2
UPSTREAM: hwrng: virtio - add an internal buffer
...
hwrng core uses two buffers that can be mixed in the
virtio-rng queue.
If the buffer is provided with wait=0 it is enqueued in the
virtio-rng queue but unused by the caller.
On the next call, core provides another buffer but the
first one is filled instead and the new one queued.
And the caller reads the data from the new one that is not
updated, and the data in the first one are lost.
To avoid this mix, virtio-rng needs to use its own unique
internal buffer at a cost of a data copy to the caller buffer.
Signed-off-by: Laurent Vivier <lvivier@redhat.com >
Link: https://lore.kernel.org/r/20211028101111.128049-2-lvivier@redhat.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com >
(cherry picked from commit bf3175bc50adelva@google.com >
2023-03-23 16:31:19 +00:00
Maciej Żenczykowski
05fa7d8eee
ANDROID: fix ABI by undoing atomic64_t -> u64 type conversion
...
This is pretty much a no-op, but avoids changing struct net ABI.
Bug: 274789652
Test: builds, net_test
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Ia744bdf0a026adccaef8382aaecc771a8d0763a6
2023-03-23 15:42:38 +00:00
Martynas Pumputis
cda90416c0
UPSTREAM: net: retrieve netns cookie via getsocketopt
...
It's getting more common to run nested container environments for
testing cloud software. One of such examples is Kind [1] which runs a
Kubernetes cluster in Docker containers on a single host. Each container
acts as a Kubernetes node, and thus can run any Pod (aka container)
inside the former. This approach simplifies testing a lot, as it
eliminates complicated VM setups.
Unfortunately, such a setup breaks some functionality when cgroupv2 BPF
programs are used for load-balancing. The load-balancer BPF program
needs to detect whether a request originates from the host netns or a
container netns in order to allow some access, e.g. to a service via a
loopback IP address. Typically, the programs detect this by comparing
netns cookies with the one of the init ns via a call to
bpf_get_netns_cookie(NULL). However, in nested environments the latter
cannot be used given the Kubernetes node's netns is outside the init ns.
To fix this, we need to pass the Kubernetes node netns cookie to the
program in a different way: by extending getsockopt() with a
SO_NETNS_COOKIE option, the orchestrator which runs in the Kubernetes
node netns can retrieve the cookie and pass it to the program instead.
Thus, this is following up on Eric's commit 3d368ab87chttps://kind.sigs.k8s.io/
Signed-off-by: Lorenz Bauer <lmb@cloudflare.com >
Signed-off-by: Martynas Pumputis <m@lambda.lt >
Cc: Eric Dumazet <edumazet@google.com >
Reviewed-by: Eric Dumazet <edumazet@google.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
(cherry picked from commit e8b9eab992maze@google.com >
Change-Id: If784a592450af38d70f16da61e36cbbaff80ebca
2023-03-23 15:42:38 +00:00
Eric Dumazet
78a559e2a9
UPSTREAM: net: initialize net->net_cookie at netns setup
...
It is simpler to make net->net_cookie a plain u64
written once in setup_net() instead of looping
and using atomic64 helpers.
Lorenz Bauer wants to add SO_NETNS_COOKIE socket option
and this patch would makes his patch series simpler.
Signed-off-by: Eric Dumazet <edumazet@google.com >
Cc: Daniel Borkmann <daniel@iogearbox.net >
Cc: Lorenz Bauer <lmb@cloudflare.com >
Acked-by: Daniel Borkmann <daniel@iogearbox.net >
Tested-by: Lorenz Bauer <lmb@cloudflare.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
(cherry picked from commit 3d368ab87cmaze@google.com >
Change-Id: Ia4d018b37af2792f0a21de028f724193797c5138
2023-03-23 15:42:38 +00:00
Greg Kroah-Hartman
fb0cece721
Merge tag 'android12-5.10.168_r00' into android12-5.10
...
This is the merge of the upstream LTS release of 5.10.168 into the
android12-5.10 branch.
It contains the following commits:
* b34e092097570621d64f707c48210a0a626e27f90ef2490a875bfc8f0961809f4acb7f8eee3521bc6ff8b482534f518a4a79f25fa93e52dd965ad39d1be271c52b2b693fe3f7bbc85090444863f46dda6e2a0521e461f8a493c0ef3edede7b3914b71dadc53f34ec3f3eb04ef278fac1fb8008703c3efa4b896bd856881ad4112c9f34a5af788e4259a4082707097ad30bcafa2ad4f130fdf66035491b7a5fc8b1afb666c3a893cc644879b595d9593797e94c19bc9771cd63edaf5c7183b7d5fa805235452bf986e1646e2be91c65762399f1fd16cd97a1406d5aa3dbe5a1195497a5104d6491ad3104b2e4c3ea9b6034ec4c7831b2e4128795914e38f02a39310143676c8a2c67a9967e726e571fd7a6a579bb875f0a34b591abac785c4d4a83bf30187be290639b40007a0139d61d28556959327b50d31309c971a4f39f992982b473d7170e1cc3c0f11330b7ba5b30998c7f42e34a0839ab976ecd049d6502ed63aff4add6099545ce720a6d43eddc56f7d996c95311ac43f7635602f6a24433483172b355cf65461b8fb515c8b1192fd121d05bcdcf437d0c76eddc1f28d190882b658e0d99dba82d49360404d99a0a96ab85074c3055515d7d87434a36ed646e5565aa001ca862950530d0e2cf994bbc34401d2b1e8e20b9ac4d9c86e99758ffe1c01b28bf868f4e66ba3cfbd09b0bf9ff8aba483f7087d4ff187370154489f54fb430c698812236bb6a9e7e2887cc4babbd1f59a4a493e5994d9c962716b6d44072116362b8617098c93a0160de2785aa34f53c6e7e77dd6991251a362a2f55316824169e74539fc3ef5163d1c4edbf0c67fb7775b5437e0ba9fefb47a833f9815b303ede990d1571d08a9b0ad28c6b46d4269bd6074e1836dbb8daf08de8c4a25e2b557fa6351b1f56cc0e2d0f276d509ff2bebc2c60c27e0e37d5a2dcee53b405332f4ba5acb54d406446369fb90f9db1209fd744c03c04bd0050b7ff19c9a2ba46a1c0263f1ef185468631a26cef004167a8beb8540ddb73d4468d823aaa2219f1f99be3f84c9b72fb743435cd17e284c273db2eca102b357fe4fab870032a7d5ff58fe3e574b39f3dd454fe230be65a187ff8128bb162a0806eb4e9c1b1e1a03af20f63216ef652f35dcf9a2ce0387de16d75b2498584ccf47f9828fb1f34c6142f0d870a565bd68583f52c23eccb532ada0308b7dfea4aacf3d784d4c008f3b7539ca5dcbced173f77fd8949ef3a7a8ebc2efcb6974aaf118076d9ebb7f0511f6c7c400cb922cef798d85586aa76c5640737e037baee16c42a6e6870886aa44923de3930a488083b3dda86ce3aa769466da70558261d580d3e13b98a8b731b53f177b504b0bd5dcfa68c99d4c4c155eba18262530cdae5c27cffbcd68fde586785b9191a3b17dd1b9a33a94b6d971830da648d8b8c4963d77c5596b2c178f311d9c740c765715a63588fb857b42a8c590ba6fee0e97ec099d7e6226917f4c4097e844a1f6768143b5fb884d748a7345145e720a02bc845f8ddf7dbf59968f9a86252249c216871bd134c4e300da569a1a84def9b10d9a0752a6a00f23016112ca345d19cae108a5fc996f4899a383b154d5204b75e9fc4026bc564f3fed79e700680a84240df70704a423c93216f35db6e8e5be0ae55ddf16dae655f10f7efe098519ed69128fc6095da16791d5a7af96b2f690842ecd72f021e97e2e08e31f63c62a84b3b5cc1a76dd9ea055355be77aa8934f119499320fd4598765dc3469a114bc5f1f6bc67866b1e0a2d77e5c0ad76c640d6a15b209b8c99e34a965f77c60fe70078802fd7623e1af8071bd0613020d048ad1baab3a52a0156a4aada75dec7c6f351af45e2a65a8727a2aa8b584cecfa566549a1b18490138d39ab0fc498f6fa12fbb16ce4382bd16dd8136fd1ee474dd66e73e5666bf3d66c1d4178eab7a920376813d8ba7de85df1db28329fbd26037b4516ba56d775671dcc5c1dcedd52cccb0aea9c6805e392f52a3c3a01e2e57ea0c6ba53f55d6e07935ec78de50b8b21c0b3e5ea3c44c8a73c1dbdd5fa89210a0e78da590924179624a57be699cce29a3d5f181bdac1a279d79eddaaadf22b8bc72b4952217721b763c208f1e84aef11bc4bb9c392c350a071e5cd1018be1067427af6c201b438fc2491562a89a77271d2c6e3c12ff903ba86bb382f45b20c39d6544bccc14012603cbdbf1d287c1475105d943da3ef53248359590f50ecd960fff8e2ae2a9dcc8ca75e80d1185a7a040795c9da2cb968e924f79e6731132df12aa9f2658a01e92c70059106600ae7e06107a8f15cd26f38d16f9c58f1e9e63dc896db02856e4b5e53894681682dc4ab24e333531268a8753bd43374856ee8feca9179819909c22eed23765b7efeed828cb171d0d2cf193cd85314e0db5d44bc20d0dedc7aa06e9ec5ab2f44c60bb8fcd49b230921c5b6181246b898f9343774654f7a9f8e45720e96562a23cf2551f8cbf24d70a8a9ab83e3a5be74081105213f66fc1600858ca60d59b9ea2e6286e3e90cfb9699ea528ecac3076f872314e9c6556708e0140e9da3de77faee2878e8151f04aa4c9b3e454bc17e6381f901b4bfd096ccba4a1aaadd9b0930abdc16c8362fd232bbd6e84ec6e25d1ab0098333413638f615cab21235675822baf950712bd74ecc03bf73e09a20d0a6d17e187523fa7c2d1fd99e8e72009139a6bf6c7f180118bd1c9c02936b8b15a20040e48492f7845de23f3093027183c7c36bb6ea2cbd8159701e32d1c96ab0d4a37a433a9f1b907b74985c5757a88a0d16e1b912ed136368bcd063854ca71bc0e1057f5ddfbc9a5fd0844e28840e46ea5dac4c7212446c7251f0196c6f0c3e0027164b24caaea2ab6bcf38e7624160806adc9b092f0c2d1fb3d47227f0453277feb40ca78c996592b30a27e414e72a56e18e2bfcfaabd9be5b57ab0d0675bc33d83cac6c00d4aa749e043ca8ef4d9128b9a0e2168cbeb603204e6a70fd84a3a1114aa6091f85db4c98407a4ae33d13818a992f90fcedc5cad965cedb9b63a80c4544c635c60f10287d18f5aaaa7cc4aba81ace0656ba20d6056b2b331d2137cb769960ef85eaaa17c06b210771465badda810fab9bb65b856c9e2c11c3112df4cd2bf401062d8d785607e5e68c71777b6aafb6063aa851dbedee2fbddb3552672adc64f3e65ee3083307d1725dbf23eaabceae1b38c4a17c6bc47883105c443b390f2c550efeff982702f097585417a09eecc35badfe0df1242cd146492204999319ff2d645fde4a20e1480ad275c139df02234e6bf8ed0a93b59f7bc28a6b6eb02c596ef4c7afa95131472f94c65aa15a8400f5ef26276b2ecf0819e423ad034760d9ff5ad2035b700b9c0407b3672c40b57d7b1dcdda20f56a35be01f35efa1f881d9201434909edcaa41d63f204af90f8b36dbb7c7b2c89bc847857fbf64e56fb28d0c46b55d667e39c4f4cf13301a69a3f257a98e56df376e24584b2cc7b36e5a0583744232ef345e52a9ee7c24bbc6a0993bfee756980e4ba5d279097b2c917e5105f65f48516f4a2ad10027ec369e215407710427d9f0ff5de3eae2639cd2c106d0d33c9398e14bb73e3d90ca9066d655a9d82670b20617366b92b80c9b6c74d2376264fb6dcbfeabb3ceb04e0f5c962c0513787ff9ab314f6c3514226ce95a9998ebbdc3b69d896b6095f41212dc20b70f6ea4de68e088d0dcb0d627bc71be16a0c2f0da99012d31a56cd972c4cc218e2170e6fbc566f27c0867397fb59d12ae74c363e2961b8b7922374a5584ba9b3adfefe804b95eaa8a953769469f8f1b33e42d65e60d4383c1bf86d3338c899017eb3de56d87959c6ecb8e8b2e5b5c75efd0a5451efb2caf899baf6cb5d112deb2aa1766efc5bb5d0f7c240c0a3d215848ff64edf9ddcd1a4ade597e7896000ec75bc436858de7a95f07a04f8500953d24a95929620f8a5c76302709784dfc01905b830e95fdc968d3e87d43c15d0cf84df9882601ee6407f47728c00092b218df06c9802879404839e0c84a2f2ed4971e99ec1319020f56a3c86c2a2ec4b98004f926d20af66617ec0a738875cf9cd6980807223d5e75fd6d18d6e2dbdc698ce9168af1a4842bf83a303f2439cbbc1510a0662d59721a773ec893505c187b82c7c487cd8e291dea72228e71fd8d5772dbbfc207c4420574899ef6cc791f29d127b37bfe1e039a062307558e74e17819cb324bc27ea4e652f1d66a8d9f6614a73ffcf71676de94443252b6155aed4768c82733e243df07728ab7dd5a68cdb1032520b21130661441252c0622e53b838b1b9caff3dd2c1be362495bf45b677629cae43dd254853e61eacf9930cb31bd88318a489a3fd2b17026685342cfd8426a506b5c92734fe9c2251c84d1ca22894f01ecc2a7e37578069b45e77b792d9fa243ab22437b06223e379b88a8fcea018aaf7d1d73c303412576d2ebf8546f11c420061ab5153c0aa6e6ab0e918762f8ac023597bae8c444b30615148dfceab780297af3cd5db9aaf1b25dbd87379c2137d565c7c15d7ecce4c57f612f4289f512d080f6d6974b040b844796b8b20aab8cf185c1419467b3631a2e12cd6026e253b6c8222380bd9b4be728ddc48068ab51d5fed9f252a720882882734bbc5ae77930277b591b2919d66f359ad665e79f77ea456abf8046bc3e8bbcbaa12407462d344cf50587e0d992c044ceaf0b782266f7e2fcab7f2167f10fc0af0e115ff57ae492f624b3282a977ab711f3edacc512539c4dfb6d54893f5d8738fbefe6ea044c4f9089b9554ce2462bcf3a8be7c2787153319671a740c537f52f24474d12e36be7afca1e12f4c32129f604702b7582f5fc2c508371068ff7a203471b9723ffde78ad17c82aad62b725b6fbbc863b67350d3767082eb7691fa41021d8dcc3dad07b0ce902e1080729b9a1c7b03d00cc3607ed7ed4138e1b775fd49dc17c3c0ae46693be4a8573b0406c9d468c0812a18e48ec2eb1a387772c0e552bcd3a8925d6c2727dbfe8da076490b02b8affa0c646e3c4d3fa5f3d3f3564edcd28191beefd025f32f1c6447d0fca63a1ae13458e21146c04b737246ff17c2eb9ce8e8022da1fa7d7ab25ead2abd734338b42580c8d8dd1e1bf916329a766355148dcbd3af755eb08792037db10e3fe2d60023af10d713532f100caacfa07d86851c30dd31d730404f238212c7ebc3c777853ac0217ca9eeb75f80bc9606bbc271a42a23bdae3cb18dea1187792567d9e7aa8a47095b0b6553bf6d935a0265ebc2fb6afc648cdb8bf3c69bc8e34dbe4cd23cd38af52492711824ccabee2e8bb402b06cd4865bb44fd3a118046edd0cdee5ec93b5430ed464b035c0b0b83d3f3f911999b19340dba68d413e997e4ce8dcbc51d31d22c1d8f24c9b267051c80461a8c2785a52380b8190624938117c3a20bfd23c973736905c544c7c6aa39b4de080821be5a5ab6736b61ecfea1422003157ce1a36c01e2a27dab1edb995b5ecb48d3db8913f2a944c23a0e2295c2a413fe82420a8f9698a05ae5d96bae34794d07fe667349025f03d5f83a62eaea9e64dec6939f84e53b58c87196630e0a066b62a930b75bfc1207219a4452e85cc3e09c007e239e9453c13ae34836c59238e65e707641f5571cb1d9dc96fee2612654b7d8dbe5816b27b582dd58a18e4539eb5c06a65f4644b57f215a231dc02d8e59d464506de9b0abfe735beda1a33795d8d2ff5b3e2e3bdda22b4e215512959195cb98861f0bd6504e576957b6aed81c8bbf5b240b4be399e7fded04fbb2ac0a7059b0d240ac0e403f51c72993929576f10aaed333e22f0c36ea424ca8cb20c229f9923baa2462db582e814ad1353c545b96601a6f2ece2c7220bcfccb4865814d77e2f490b233677a42e955475ddd2bb08bdc2a9843342ca31ad0932147af0c1e73a63c4ff57160b92ab4aaeef93416c5beadb55f472283ecfdc73ca3b19d9c8e77bd749bd29da58046364577ae21d6d90994aae2eb995ab6ba4b00f88ee13e2aec3164857bc0271bca42bc43922415e4cf279a7af79c56c1449cc86fa7bb4e2962f869b36b7bf15aa199ac541a08961df25c41b6d79546622aeee7ad08937d3de40c1b9fa01fb31daa8045a9946b3885c8cc46db6088b7b289b791a0d1c2c8db2e88b89a0961b6a53e44752302c30b2c3767f810507905a9249bb5e9402b23feb8fd8bf83e321a2ecd1b73eebc78eb2a679c650aaa6b1746b22e715bb0f63c0ddc2170e8c2d2bd34742245e0f67ed565f57c857353da40e1b0a927525741cb30b5a89e8bcd7c4331c07a26b13d1588ff88d007faf320d1a3c07f4ca68b046d08b0e0bd5b16eb076fab27438abd3b6c28a711ca02df8715d2b286eb0775a6f8bed2fcb7c7d529bf7a0b2b127b612bd0918a72006467e74868a38fce9890e1bd217141345aa96aff3945998e5c30e38da26c85515ca14894083b2c33b5373ab1c956a0c53bb661f7cbf2fc27661c5b47c5b09814c669d75c7b5d6b5357f3e175625a8dabaabd1b85d2883ad27f74e9022e8c7a56bf4ba143b04b520a327969d0ad1e2ba2b142f6046eaa71cdae8ac5cfe8bbbf671a3f286ce1a69cc857ccfc2bb588e0681dd4e4a99e6a104c808edbf586bb5a62bfd164fa803303d47544ba034bab85c2ed8f2a0bc528b5f1af335cc5e915358ed97ade6552dfe1d221e1ab9e15b1433260f4c3e917bf4c0a7237a8936d675af03fdf3ef8e2368329a32aa87a2417ef568a76cd8bbb089de041a2e700971bc99d1b0b9635f09fbd5f112dc86f1e7f46ba13c0ff862f1acf7e693c42d8120bf16db9aaa419784b01eb46962f682d0f4c917a4b03bebfa5f93ee3cffc38ebf4d7c66a178629ca972935d86b290f694e627c6815b961c714002180e0782256faaeb33af776a8d5991402fe00169acb41bf7dc27702b214346a51713286ad1c74df544f59239b48a92ed334c9fb89203ea9ba5fd8eb5f8ae51ee3b1364afb242358a27decede59eac43def060c0e2325014991f09a776a51e2d1b84a0b3f452d0c2b4af99b4414b349a15c787d1bae7f8ed9994457e2227eee7a3e8fd1d0fa4b672ee71cae8190f19f782d0444ea2484f15964f89c0fbb8bd4300372487f3b4fa482da13355bb9d9b37ea88635ddd00b366fdb8661b90b1e96d3fd1922def5cb63400da6cd64b2c44117fb3d59626700ac0f5f959bedf64dda3049a3b927aabbedcb6c7fa922c7a3b896a9b7a03904eb97bb7c3b301ca84a6e5d022281ea3d964f3fbc3c78fabe7d90fc3a06491293597df1fbe49b46a9b31369be719496ae8c3ef38a0de7720ef53b6a03c31d0874ac7c9ee20cf92d2356c671f2d10d28921ec5558cee8543f038d13a2a9eee4425e81d6f25402d8af532db69ab4ecb7a6e61b2c0b94f48b0163248dbab19f402a1c58df40e3e28e4a763cd429a2a4258cd0e9ee50c7c1ddf7c663991d98a8aa012cdd4fd57491967ad52c9ad56c1ae966649f6ae66695aa15458bc0f9dbc60485b93d16d7870fd15feece7af58a1023eb5193691ff5b6013c3de95cf2cbca71454ab127600559891d430e34cf6cacc05be5d56f79916497a12dabf7b675c14d85b600b4518d7cc38b73fac67f31d0c2b762d7d1e0d237c3725a8f26bf4d70c139da065be0243d7198b63cb88550b4446ad2d0a3dc20d6ae25da59920e87a8449aa080951847006001949060c0da50369af6fe33afd738e770919982a17effbf63616adf03c30993bd737289c102df01caf6f6a99fb6285273b4a70f48c474efe21a1409e8c698bbaf0b4b4b30f56eccea79ae89b00fce49d143d5cab726e61c96d99d4624438195c330bc5533e1a79539f4ee1989d808bcdd73a5ed042b2b7382a7fc38327fdf9d19f3a0472e8d9c731d959ff7fa9b12f354fe6c4b035b1f0d5b227f0d2576828e59af1aa976857dd958c7f3e110bf158251874f9143f669bdf121fa50ad6772fcd56718e7cf83742285ffbd155fe1496af45b1b4caea629409eafcf1b599cd50258e9c580c79fd57c93cac58a74882492ad386d531c1d783f7e3c9887e0ba56c7e85b297d798c61650b86926ce3f0c8f9b6851c18298d9172822c3fb3e9a2c53915ecc43cff9fefdfb93cdd12636bbaa9ca0635ee850645ead4842634d6f8ef1de8c7b88747d6dd4c38ee66517cd8c46cbf983afc4322cbbd78e0846026bb05770e7f308d7fc134c355b95dbcb7e1c02617006b57bc9c5ad52270700e7dffc89b8853a4750cac4dfd8e7a44f480853787db297d9eb45ff88fa351b202b7e59ed2e45dabd8fe8e403024c8381d26aa903f649e18c9c869a37ad6fc39aa503f400804616249346517ed2d97e58f7282db53c7059f870d5863e5c0cacdd350afcb759f6d2afced511c0539d5d47dac87e295ce1049bf0ca911773f08c48d42f4464f5f2682d3ac9a9aa02f09f6ea28f29d5bf025c5b2f2ae35c00a1014fbc8360a7a0aa9d294ed8bfc93ef12a4a8eaa5f2912bb9e760e0cf2ef875e1c071498d2723e2ff4014417ca9ef12bf76389c163c95b217f4e79295f59cd2c480bc6a165d1b3164d0e4dad729f7c872865db3bc1322d5f69d050513e6fbac1a77b85ea907f3032ea8e313bb9697b92a64873ab831afdc2cb1683d11261352836853d57e961436ac713a4148e773557a938c2a774a455b0c50942d97a024e359286f8869afac95b875e88aec62e6a9a31c578e325b4ee410542d56e63a8d4fb0bf16213df4f5f45d180a9f68fb204a4b56a2faf6fce6d1b6dc38f933499bed7275a67e90982baee226382569f7e404cef81dec25465b9a8136cad948c9f60184b14379e60339cb41cd4863ea84c961b9302332c489d8b8596b998840fe4548663189556b05e4ef66581d72f09377502b76c5373f087cb08dc6ba3025359ff6ef2b4728ac91ab04781788d082426ed30050329831cb78a2a9ded44b69cf0a5f0dc01dd26e2cec7320c8057ec000de389ad0f735cf52b4b4d2c799290a2c3821b61bdeb142e6e2bce21acdb911277a2a1240cc413e1402ba4df78a53ff02657e833a0a0751fedb9ba48e9e35d33c82617d9de30b78a17acbf0b6195931bee9dbbca02d383a59c19f3e328b4c2037d61de12284aec883fde31e962dc808ffd970aef2ec0638ca2e57099abab3d444445b365bc6ccf3c648673fe137f46d479a9991e872dbb0354514b1dcf8ec9eb42e7b3043c295bd2ddd2136fc14557b2053036214f80e25152cfde6bbfad0b013795069ac28d920b8cd5d8145683caa7350cf0ce8fb5146fe79fffc1fe7bd3e136ec31201ae86db871911500fed008bf760358ea416c4356f31a9148dfd8eec1c3ade4f3fe6817157c3a523c9b1d5db0c322263a1782a6a20b5eec07f2479c3daa9ff7aff40ec8bf31a00f5b75a004169895ce5ea2398215f783c79538f32d8b2f86f82cdb873b770d1a075f4a541f7f7365aegregkh@google.com >
2023-03-23 11:09:43 +00:00
Darrick J. Wong
989d4c69a9
UPSTREAM: ext4: fix another off-by-one fsmap error on 1k block filesystems
...
commit c993799baf#1 ] PREEMPT SMP
CPU: 3 PID: 3227965 Comm: xfs_io Tainted: G W O 6.2.0-rc8-achx
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.15.0-1 04/01/2014
RIP: 0010:ext4_mb_load_buddy_gfp+0x47c/0x570 [ext4]
RSP: 0018:ffffc90007c03998 EFLAGS: 00010246
RAX: ffff888004978000 RBX: ffffc90007c03a20 RCX: ffff888041618000
RDX: 0000000000000000 RSI: 00000000000005a4 RDI: ffffffffa0c99b11
RBP: ffff888012330000 R08: ffffffffa0c2b7d0 R09: 0000000000000400
R10: ffffc90007c03950 R11: 0000000000000000 R12: 0000000000000001
R13: 00000000ffffffff R14: 0000000000000c40 R15: ffff88802678c398
FS: 00007fdf2020c880(0000) GS:ffff88807e100000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007ffd318a5fe8 CR3: 000000007f80f001 CR4: 00000000001706e0
Call Trace:
<TASK>
ext4_mballoc_query_range+0x4b/0x210 [ext4 dfa189daddffe8fecd3cdfd00564e0f265a8ab80]
ext4_getfsmap_datadev+0x713/0x890 [ext4 dfa189daddffe8fecd3cdfd00564e0f265a8ab80]
ext4_getfsmap+0x2b7/0x330 [ext4 dfa189daddffe8fecd3cdfd00564e0f265a8ab80]
ext4_ioc_getfsmap+0x153/0x2b0 [ext4 dfa189daddffe8fecd3cdfd00564e0f265a8ab80]
__ext4_ioctl+0x2a7/0x17e0 [ext4 dfa189daddffe8fecd3cdfd00564e0f265a8ab80]
__x64_sys_ioctl+0x82/0xa0
do_syscall_64+0x2b/0x80
entry_SYSCALL_64_after_hwframe+0x46/0xb0
RIP: 0033:0x7fdf20558aff
RSP: 002b:00007ffd318a9e30 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00000000000200c0 RCX: 00007fdf20558aff
RDX: 00007fdf1feb2010 RSI: 00000000c0c0583b RDI: 0000000000000003
RBP: 00005625c0634be0 R08: 00005625c0634c40 R09: 0000000000000001
R10: 0000000000000000 R11: 0000000000000246 R12: 00007fdf1feb2010
R13: 00005625be70d994 R14: 0000000000000800 R15: 0000000000000000
For GETFSMAP calls, the caller selects a physical block device by
writing its block number into fsmap_head.fmh_keys[01].fmr_device.
To query mappings for a subrange of the device, the starting byte of the
range is written to fsmap_head.fmh_keys[0].fmr_physical and the last
byte of the range goes in fsmap_head.fmh_keys[1].fmr_physical.
IOWs, to query what mappings overlap with bytes 3-14 of /dev/sda, you'd
set the inputs as follows:
fmh_keys[0] = { .fmr_device = major(8, 0), .fmr_physical = 3},
fmh_keys[1] = { .fmr_device = major(8, 0), .fmr_physical = 14},
Which would return you whatever is mapped in the 12 bytes starting at
physical offset 3.
The crash is due to insufficient range validation of keys[1] in
ext4_getfsmap_datadev. On 1k-block filesystems, block 0 is not part of
the filesystem, which means that s_first_data_block is nonzero.
ext4_get_group_no_and_offset subtracts this quantity from the blocknr
argument before cracking it into a group number and a block number
within a group. IOWs, block group 0 spans blocks 1-8192 (1-based)
instead of 0-8191 (0-based) like what happens with larger blocksizes.
The net result of this encoding is that blocknr < s_first_data_block is
not a valid input to this function. The end_fsb variable is set from
the keys that are copied from userspace, which means that in the above
example, its value is zero. That leads to an underflow here:
blocknr = blocknr - le32_to_cpu(es->s_first_data_block);
The division then operates on -1:
offset = do_div(blocknr, EXT4_BLOCKS_PER_GROUP(sb)) >>
EXT4_SB(sb)->s_cluster_bits;
Leaving an impossibly large group number (2^32-1) in blocknr.
ext4_getfsmap_check_keys checked that keys[0].fmr_physical and
keys[1].fmr_physical are in increasing order, but
ext4_getfsmap_datadev adjusts keys[0].fmr_physical to be at least
s_first_data_block. This implies that we have to check it again after
the adjustment, which is the piece that I forgot.
Reported-by: syzbot+6be2b977c89f79b6b153@syzkaller.appspotmail.com
Fixes: 4a4956249dhttps://syzkaller.appspot.com/bug?id=79d5768e9bfe362911ac1a5057a36fc6b5c30002
Cc: stable@vger.kernel.org
Signed-off-by: Darrick J. Wong <djwong@kernel.org >
Link: https://lore.kernel.org/r/Y+58NPTH7VNGgzdd@magnolia
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 260486287
Change-Id: I07ac9fcb91671016f4b6a10ef5c8711eea74fb26
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-03-20 22:51:52 +00:00
Lukas Czerner
b0d829f27f
UPSTREAM: ext4: block range must be validated before use in ext4_mb_clear_bb()
...
commit 1e1c2b86ef#1
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.15.0-1.fc35 04/01/2014
RIP: 0010:ext4_free_blocks+0x95e/0xa90
Call Trace:
<TASK>
? lock_timer_base+0x61/0x80
? __es_remove_extent+0x5a/0x760
? __mod_timer+0x256/0x380
? ext4_ind_truncate_ensure_credits+0x90/0x220
ext4_clear_blocks+0x107/0x1b0
ext4_free_data+0x15b/0x170
ext4_ind_truncate+0x214/0x2c0
? _raw_spin_unlock+0x15/0x30
? ext4_discard_preallocations+0x15a/0x410
? ext4_journal_check_start+0xe/0x90
? __ext4_journal_start_sb+0x2f/0x110
ext4_truncate+0x1b5/0x460
? __ext4_journal_start_sb+0x2f/0x110
ext4_evict_inode+0x2b4/0x6f0
evict+0xd0/0x1d0
ext4_enable_quotas+0x11f/0x1f0
ext4_orphan_cleanup+0x3de/0x430
? proc_create_seq_private+0x43/0x50
ext4_fill_super+0x295f/0x3ae0
? snprintf+0x39/0x40
? sget_fc+0x19c/0x330
? ext4_reconfigure+0x850/0x850
get_tree_bdev+0x16d/0x260
vfs_get_tree+0x25/0xb0
path_mount+0x431/0xa70
__x64_sys_mount+0xe2/0x120
do_syscall_64+0x5b/0x80
? do_user_addr_fault+0x1e2/0x670
? exc_page_fault+0x70/0x170
entry_SYSCALL_64_after_hwframe+0x46/0xb0
RIP: 0033:0x7fdf4e512ace
Fix it by making sure that the block range is properly validated before
used every time it changes in ext4_free_blocks() or ext4_mb_clear_bb().
Link: https://syzkaller.appspot.com/bug?id=5266d464285a03cee9dbfda7d2452a72c3c2ae7c
Reported-by: syzbot+15cd994e273307bf5cfa@syzkaller.appspotmail.com
Signed-off-by: Lukas Czerner <lczerner@redhat.com >
Cc: Tadeusz Struk <tadeusz.struk@linaro.org >
Tested-by: Tadeusz Struk <tadeusz.struk@linaro.org >
Link: https://lore.kernel.org/r/20220714165903.58260-1-lczerner@redhat.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 237951970
Change-Id: I2a45df5fe3f47c9408bed79f83a61b68c00efa22
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-03-20 22:46:13 +00:00
Ritesh Harjani
0301fe419a
UPSTREAM: ext4: add strict range checks while freeing blocks
...
commit a00b482b82jack@suse.cz >
Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com >
Reviewed-by: Jan Kara <jack@suse.cz >
Link: https://lore.kernel.org/r/ddd9143d064774e32d6364a99667817c6e8bfdc0.1644992610.git.riteshh@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 237951970
Change-Id: Ibab39a43f13af206af8c384e7c5590925a089f00
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-03-20 22:46:13 +00:00
Ritesh Harjani
1d4b2a4ad7
UPSTREAM: ext4: add ext4_sb_block_valid() refactored out of ext4_inode_block_valid()
...
commit 6bc6c2bdf1jack@suse.cz >
Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com >
Link: https://lore.kernel.org/r/dd34a236543ad5ae7123eeebe0cb69e6bdd44f34.1644992610.git.riteshh@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 237951970
Change-Id: I4a63d1f1c720bce9612600c9c6034ddeda389d01
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-03-20 22:46:13 +00:00
Ritesh Harjani
8ddbd3df93
UPSTREAM: ext4: refactor ext4_free_blocks() to pull out ext4_mb_clear_bb()
...
commit 8ac3939db9riteshh@linux.ibm.com >
Reviewed-by: Jan Kara <jack@suse.cz >
Link: https://lore.kernel.org/r/22c30fbb26ba409cf8aa5f0c7912970272c459e8.1644992610.git.riteshh@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 237951970
Change-Id: Ib8c113a85e620eff6d4561a38c97f875a476ab7b
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-03-20 22:46:13 +00:00
Bin Yang
370cb1c270
UPSTREAM: usb: dwc3: core: do not use 3.0 clock when operating in 2.0 mode
...
In the 3.0 device core, if the core is programmed to operate in
2.0 only, then setting the GUCTL1.DEV_FORCE_20_CLK_FOR_30_CLK makes
the internal 2.0(utmi/ulpi) clock to be routed as the 3.0 (pipe)
clock. Enabling this feature allows the pipe3 clock to be not-running
when forcibly operating in 2.0 device mode.
Tested-by: Michael Riesch <michael.riesch@wolfvision.net >
Signed-off-by: Bin Yang <yangbin@rock-chips.com >
Signed-off-by: Peter Geis <pgwipeout@gmail.com >
Link: https://lore.kernel.org/r/20220228135700.1089526-6-pgwipeout@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 62b20e6e0dkever.yang@rock-chips.com >
Change-Id: I7e53aaa54dd247f399a16406acb832a9f9a5a5eb
2023-03-20 17:29:10 +00:00
Kever Yang
eb53a59b4d
ANDROID: GKI: rockchip: Add symbols for clk api
...
Leaf changes summary: 2 artifacts changed (2 filtered out)
Changed leaf types summary: 0 (1 filtered out) leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 2 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed (1 filtered out), 0 Added variable
2 Added functions:
[A] 'function bool clk_has_parent(clk*, clk*)'
[A] 'function int of_clk_parent_fill(device_node*, const char**, unsigned int)'
Bug: 239396464
Signed-off-by: Kever Yang <kever.yang@rock-chips.com >
Change-Id: I51511f8736dc992ebe8cf85d9c0d41f588c66e24
2023-03-20 11:49:00 +08:00
Evgenii Stepanov
a13e8447e8
BACKPORT: arm64: mte: move register initialization to C
...
If FEAT_MTE2 is disabled via the arm64.nomte command line argument on a
CPU that claims to support FEAT_MTE2, the kernel will use Tagged Normal
in the MAIR. If we interpret arm64.nomte to mean that the CPU does not
in fact implement FEAT_MTE2, setting the system register like this may
lead to UNSPECIFIED behavior. Fix it by arranging for MAIR to be set
in the C function cpu_enable_mte which is called based on the sanitized
version of the system register.
There is no need for the rest of the MTE-related system register
initialization to happen from assembly, with the exception of TCR_EL1,
which must be set to include at least TBI1 because the secondary CPUs
access KASan-allocated data structures early. Therefore, make the TCR_EL1
initialization unconditional and move the rest of the initialization to
cpu_enable_mte so that we no longer have a dependency on the unsanitized
ID register value.
Signed-off-by: Peter Collingbourne <pcc@google.com >
Signed-off-by: Evgenii Stepanov <eugenis@google.com >
Signed-off-by: Qun-Wei Lin <qun-wei.lin@mediatek.corp-partner.google.com >
Suggested-by: Catalin Marinas <catalin.marinas@arm.com >
Reported-by: kernel test robot <lkp@intel.com >
Link: https://lore.kernel.org/linux-arm-kernel/20220907003630.1115439-1-eugenis@google.com/
Bug: 239834217
Change-Id: I7bd247ae5802295c198bac42df86fab9e9e9cefd
(cherry picked from commit 6a2905d35289caeeecbafa93ae4ff7cefafd02ed)
2023-03-17 23:17:49 +00:00
Ingo Molnar
eddac45546
UPSTREAM: rcu: Remove __read_mostly annotations from rcu_scheduler_active externs
...
Remove the __read_mostly attributes from the rcu_scheduler_active
extern declarations, because these attributes are ignored for
prototypes and we'd have to include the full <linux/cache.h> header
to gain this functionally pointless attribute defined.
BUG: 274028827
Change-Id: Ib9c1d34ad2325b8cf939f5df0b35ebe4b281e9ec
Signed-off-by: Ingo Molnar <mingo@kernel.org >
Signed-off-by: Paul E. McKenney <paulmck@kernel.org >
(cherry picked from commit e6339d3b44quic_spathi@quicinc.com >
2023-03-17 16:30:15 +00:00
Seiya Wang
afff17f583
ANDROID: GKI: Update symbol list for mtk
...
6 Added functions:
[A] 'function int of_get_pci_domain_nr(device_node*)'
[A] 'function int pci_generic_config_read32(pci_bus*, unsigned int, int, int, u32*)'
[A] 'function int pci_generic_config_write32(pci_bus*, unsigned int, int, int, u32)'
[A] 'function void pci_lock_rescan_remove()'
[A] 'function phys_addr_t pci_pio_to_address(unsigned long int)'
[A] 'function void pci_unlock_rescan_remove()'
Bug: 274051294
Signed-off-by: Seiya Wang <seiya.wang@mediatek.com >
Change-Id: I30fe96d94e3a371a44a977e696bafda4b23e7e63
2023-03-17 07:46:27 +00:00
Jun Nie
62f5fae173
UPSTREAM: ext4: refuse to create ea block when umounted
...
commit f31173c199syzbot+2dacb8f015bf1420155f@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?id=3613786cb88c93aa1c6a279b1df6a7b201347d08
Link: https://lore.kernel.org/r/20230103014517.495275-3-jun.nie@linaro.org
Cc: stable@kernel.org
Signed-off-by: Jun Nie <jun.nie@linaro.org >
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 262267471
Change-Id: I0a5c974e696cf7a132f3cbb8acbe066edba4660f
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-03-14 06:23:51 +00:00
Jun Nie
33245a0eac
UPSTREAM: ext4: optimize ea_inode block expansion
...
commit 1e9d62d252syzbot+2dacb8f015bf1420155f@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?id=3613786cb88c93aa1c6a279b1df6a7b201347d08
Link: https://lore.kernel.org/r/20230103014517.495275-2-jun.nie@linaro.org
Cc: stable@kernel.org
Signed-off-by: Jun Nie <jun.nie@linaro.org >
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 262267471
Change-Id: I26e7d45ab21bcf9e38eeb66601067f42b01c11f5
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-03-14 06:23:51 +00:00
Ye Bin
09e5cc649d
UPSTREAM: ext4: allocate extended attribute value in vmalloc area
...
commit cc12a6f25eyebin10@huawei.com >
Reviewed-by: Jan Kara <jack@suse.cz >
Link: https://lore.kernel.org/r/20221208023233.1231330-3-yebin@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu >
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 262267471
Change-Id: I92a4a66d8220f46f26a89100ba41c659559443a7
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org >
2023-03-14 06:23:51 +00:00
Prashanth K
8926771f7e
UPSTREAM: usb: gadget: composite: Draw 100mA current if not configured
...
Currently we don't change the current value if device isn't in
configured state. But in battery charging specification (section
1.2 and 1.4.13), it is mentioned that the device can draw up to
100mA of current if it's in unconfigured state. Hence add vbus
draw work in composite_resume to draw 100mA if the device isn't
configured.
Signed-off-by: Prashanth K <quic_prashk@quicinc.com >
Link: https://lore.kernel.org/r/1677217619-10261-3-git-send-email-quic_prashk@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 272680990
(cherry picked from commit 2ae4e0dea3https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git/ usb-next)
Change-Id: I51688c84f66d2d5e023b61444e03503092ef41d0
Signed-off-by: Prashanth K <quic_prashk@quicinc.com >
2023-03-10 19:28:53 +00:00
Prashanth K
87a065fb94
UPSTREAM: usb: dwc3: gadget: Change condition for processing suspend event
...
Currently we process the suspend interrupt event only if the
device is in configured state. Consider a case where device
is not configured and got suspend interrupt, in that case our
gadget will still use 100mA as composite_suspend didn't happen.
But battery charging specification (BC1.2) expects a downstream
device to draw less than 2.5mA when unconnected OR suspended.
Fix this by removing the condition for processing suspend event,
and thus composite_resume would set vbus draw to 2.
Fixes: 72704f876fquic_prashk@quicinc.com >
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Link: https://lore.kernel.org/r/1677217619-10261-2-git-send-email-quic_prashk@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 272680990
(cherry picked from commit 4decf4060ehttps://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git/ usb-next)
Change-Id: I902b8911debb7c049a4a0128077ea8d931900d1d
Signed-off-by: Prashanth K <quic_prashk@quicinc.com >
2023-03-10 19:28:53 +00:00
fengqi
26638f8e54
ANDROID: GKI: update xiaomi symbol list
...
Leaf changes summary: 4 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 4 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
4 Added functions:
[A] 'function int __iio_trigger_register(iio_trigger*, module*)'
[A] 'function iio_trigger* iio_trigger_alloc(const char*, ...)'
[A] 'function void iio_trigger_free(iio_trigger*)'
[A] 'function void iio_trigger_unregister(iio_trigger*)'
Bug: 272669403
Change-Id: Ieb112f091b22e9893e627e0f934c45bd1ca940b2
Signed-off-by: fengqi <fengqi@xiaomi.com >
2023-03-10 17:32:30 +08:00
Pedro Tammela
193b312b2f
UPSTREAM: net/sched: tcindex: update imperfect hash filters respecting rcu
...
commit ee059170b19b0d4446b5sec@valis.email >
Suggested-by: valis <sec@valis.email >
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com >
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com >
Link: https://lore.kernel.org/r/20230209143739.279867-1-pctammela@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Lee Jones <joneslee@google.com >
Change-Id: I02ce525a338242efdb8080e2e2c705d3b59d9a68
2023-03-09 11:27:04 +00:00
Elliot Berman
9a1be9a472
FROMGIT: KVM: arm64: Ignore kvm-arm.mode if !is_hyp_mode_available()
...
Ignore kvm-arm.mode if !is_hyp_mode_available(). Specifically, we want
to avoid switching kvm_mode to KVM_MODE_PROTECTED if hypervisor mode is
not available. This prevents "Protected KVM" cpu capability being
reported when Linux is booting in EL1 and would not have KVM enabled.
Reasonably though, we should warn if the command line is requesting a
KVM mode at all if KVM isn't actually available. Allow
"kvm-arm.mode=none" to skip the warning since this would disable KVM
anyway.
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com >
Signed-off-by: Marc Zyngier <maz@kernel.org >
Link: https://lore.kernel.org/r/20220920190658.2880184-1-quic_eberman@quicinc.com
Bug: 249052880
(cherry picked from commit b2a4d007c3https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git next)
Change-Id: I196649fc00537e563a1fab0a22bf23c5b7abe00d
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com >
(cherry picked from commit 8015dd49c0
2023-03-07 19:28:52 +00:00
Mark Rutland