Commit 660e4b18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-08-07-18-32' of... 

Merge tag 'mm-hotfixes-stable-2024-08-07-18-32' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "Nine hotfixes. Five are cc:stable, the others either pertain to
  post-6.10 material or aren't considered necessary for earlier kernels.

  Five are MM and four are non-MM. No identifiable theme here - please
  see the individual changelogs"

* tag 'mm-hotfixes-stable-2024-08-07-18-32' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  padata: Fix possible divide-by-0 panic in padata_mt_helper()
  mailmap: update entry for David Heidelberg
  memcg: protect concurrent access to mem_cgroup_idr
  mm: shmem: fix incorrect aligned index when checking conflicts
  mm: shmem: avoid allocating huge pages larger than MAX_PAGECACHE_ORDER for shmem
  mm: list_lru: fix UAF for memory cgroup
  kcov: properly check for softirq context
  MAINTAINERS: Update LTP members and web
  selftests: mm: add s390 to ARCH check
parents 6a0e3826 6d45e1c9

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com> 
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>

David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -13324,14 +13324,16 @@ F: Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt 
F:	drivers/i2c/muxes/i2c-mux-ltc4306.c









LTP (Linux Test Project)









M:	Andrea Cervesato <andrea.cervesato@suse.com>









M:	Cyril Hrubis <chrubis@suse.cz>









M:	Jan Stancek <jstancek@redhat.com>









M:	Petr Vorel <pvorel@suse.cz>









M:	Li Wang <liwang@redhat.com>









M:	Yang Xu <xuyang2018.jy@fujitsu.com>









M:	Xiao Yang <yangx.jy@fujitsu.com>









L:	ltp@lists.linux.it (subscribers-only)









S:	Maintained









W:	http://linux-test-project.github.io/









W:	https://linux-test-project.readthedocs.io/









T:	git https://github.com/linux-test-project/ltp.git

















LTR390 AMBIENT/UV LIGHT SENSOR DRIVER
































kernel/kcov.c



+12
−3






























Original line number
Diff line number
Diff line







@@ -161,6 +161,15 @@ static void kcov_remote_area_put(struct kcov_remote_area *area,







	kmsan_unpoison_memory(&area->list, sizeof(area->list));









}



















/*









 * Unlike in_serving_softirq(), this function returns false when called during









 * a hardirq or an NMI that happened in the softirq context.









 */









static inline bool in_softirq_really(void)









{









	return in_serving_softirq() && !in_hardirq() && !in_nmi();









}



















static notrace bool check_kcov_mode(enum kcov_mode needed_mode, struct task_struct *t)









{









	unsigned int mode;








@@ -170,7 +179,7 @@ static notrace bool check_kcov_mode(enum kcov_mode needed_mode, struct task_stru







	 * so we ignore code executed in interrupts, unless we are in a remote









	 * coverage collection section in a softirq.









	 */









	if (!in_task() && !(in_serving_softirq() && t->kcov_softirq))









	if (!in_task() && !(in_softirq_really() && t->kcov_softirq))









		return false;









	mode = READ_ONCE(t->kcov_mode);









	/*








@@ -849,7 +858,7 @@ void kcov_remote_start(u64 handle)

















	if (WARN_ON(!kcov_check_handle(handle, true, true, true)))









		return;









	if (!in_task() && !in_serving_softirq())









	if (!in_task() && !in_softirq_really())









		return;



















	local_lock_irqsave(&kcov_percpu_data.lock, flags);








@@ -991,7 +1000,7 @@ void kcov_remote_stop(void)







	int sequence;









	unsigned long flags;



















	if (!in_task() && !in_serving_softirq())









	if (!in_task() && !in_softirq_really())









		return;



















	local_lock_irqsave(&kcov_percpu_data.lock, flags);
































kernel/padata.c



+7
−0






























Original line number
Diff line number
Diff line







@@ -517,6 +517,13 @@ void __init padata_do_multithreaded(struct padata_mt_job *job)







	ps.chunk_size = max(ps.chunk_size, job->min_chunk);









	ps.chunk_size = roundup(ps.chunk_size, job->align);



















	/*









	 * chunk_size can be 0 if the caller sets min_chunk to 0. So force it









	 * to at least 1 to prevent divide-by-0 panic in padata_mt_helper().`









	 */









	if (!ps.chunk_size)









		ps.chunk_size = 1U;



















	list_for_each_entry(pw, &works, pw_list)









		if (job->numa_aware) {









			int old_node = atomic_read(&last_used_nid);
































mm/list_lru.c



+22
−6






























Original line number
Diff line number
Diff line







@@ -85,6 +85,7 @@ list_lru_from_memcg_idx(struct list_lru *lru, int nid, int idx)







}









#endif /* CONFIG_MEMCG */



















/* The caller must ensure the memcg lifetime. */









bool list_lru_add(struct list_lru *lru, struct list_head *item, int nid,









		    struct mem_cgroup *memcg)









{








@@ -109,14 +110,22 @@ EXPORT_SYMBOL_GPL(list_lru_add);

















bool list_lru_add_obj(struct list_lru *lru, struct list_head *item)









{









	bool ret;









	int nid = page_to_nid(virt_to_page(item));









	struct mem_cgroup *memcg = list_lru_memcg_aware(lru) ?









		mem_cgroup_from_slab_obj(item) : NULL;



















	return list_lru_add(lru, item, nid, memcg);









	if (list_lru_memcg_aware(lru)) {









		rcu_read_lock();









		ret = list_lru_add(lru, item, nid, mem_cgroup_from_slab_obj(item));









		rcu_read_unlock();









	} else {









		ret = list_lru_add(lru, item, nid, NULL);









	}



















	return ret;









}









EXPORT_SYMBOL_GPL(list_lru_add_obj);



















/* The caller must ensure the memcg lifetime. */









bool list_lru_del(struct list_lru *lru, struct list_head *item, int nid,









		    struct mem_cgroup *memcg)









{








@@ -139,11 +148,18 @@ EXPORT_SYMBOL_GPL(list_lru_del);

















bool list_lru_del_obj(struct list_lru *lru, struct list_head *item)









{









	bool ret;









	int nid = page_to_nid(virt_to_page(item));









	struct mem_cgroup *memcg = list_lru_memcg_aware(lru) ?









		mem_cgroup_from_slab_obj(item) : NULL;



















	return list_lru_del(lru, item, nid, memcg);









	if (list_lru_memcg_aware(lru)) {









		rcu_read_lock();









		ret = list_lru_del(lru, item, nid, mem_cgroup_from_slab_obj(item));









		rcu_read_unlock();









	} else {









		ret = list_lru_del(lru, item, nid, NULL);









	}



















	return ret;









}









EXPORT_SYMBOL_GPL(list_lru_del_obj);