diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-04 22:21:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-04 22:21:16 +0200 |
| commit | a1fd058b07d58c3372c1aba25dd65f1c9c9b65f1 (patch) | |
| tree | b271ac1faa0c2c2dd3f3202a09b84d4f98fe3ceb /kernel | |
| parent | Merge tag 'mm-stable-2023-05-03-16-22' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | mm: change per-VMA lock statistics to be disabled by default (diff) | |
| download | linux-a1fd058b07d58c3372c1aba25dd65f1c9c9b65f1.tar.xz linux-a1fd058b07d58c3372c1aba25dd65f1c9c9b65f1.zip | |
Merge tag 'mm-hotfixes-stable-2023-05-03-16-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull hitfixes from Andrew Morton:
"Five hotfixes. Three are cc:stable, two for this -rc cycle"
* tag 'mm-hotfixes-stable-2023-05-03-16-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
mm: change per-VMA lock statistics to be disabled by default
MAINTAINERS: update Michal Simek's email
mm/mempolicy: correctly update prev when policy is equal on mbind
relayfs: fix out-of-bounds access in relay_file_read
kasan: hw_tags: avoid invalid virt_to_page()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/relay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index 9aa70ae53d24..a80fa01042e9 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -989,7 +989,8 @@ static size_t relay_file_read_start_pos(struct rchan_buf *buf) size_t subbuf_size = buf->chan->subbuf_size; size_t n_subbufs = buf->chan->n_subbufs; size_t consumed = buf->subbufs_consumed % n_subbufs; - size_t read_pos = consumed * subbuf_size + buf->bytes_consumed; + size_t read_pos = (consumed * subbuf_size + buf->bytes_consumed) + % (n_subbufs * subbuf_size); read_subbuf = read_pos / subbuf_size; padding = buf->padding[read_subbuf]; |