From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2024 00:09:48 +0000 (-0800)
Subject: Merge tag 'mm-nonmm-stable-2024-11-24-02-05' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v6.13-rc1~89
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/f5f4745a7f057b58c9728ee4e2c5d6d79f382fe7

Merge tag 'mm-nonmm-stable-2024-11-24-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull non-MM updates from Andrew Morton:

 - The series "resource: A couple of cleanups" from Andy Shevchenko
   performs some cleanups in the resource management code

 - The series "Improve the copy of task comm" from Yafang Shao addresses
   possible race-induced overflows in the management of
   task_struct.comm[]

 - The series "Remove unnecessary header includes from
   {tools/}lib/list_sort.c" from Kuan-Wei Chiu adds some cleanups and a
   small fix to the list_sort library code and to its selftest

 - The series "Enhance min heap API with non-inline functions and
   optimizations" also from Kuan-Wei Chiu optimizes and cleans up the
   min_heap library code

 - The series "nilfs2: Finish folio conversion" from Ryusuke Konishi
   finishes off nilfs2's folioification

 - The series "add detect count for hung tasks" from Lance Yang adds
   more userspace visibility into the hung-task detector's activity

 - Apart from that, singelton patches in many places - please see the
   individual changelogs for details

* tag 'mm-nonmm-stable-2024-11-24-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (71 commits)
  gdb: lx-symbols: do not error out on monolithic build
  kernel/reboot: replace sprintf() with sysfs_emit()
  lib: util_macros_kunit: add kunit test for util_macros.h
  util_macros.h: fix/rework find_closest() macros
  Improve consistency of '#error' directive messages
  ocfs2: fix uninitialized value in ocfs2_file_read_iter()
  hung_task: add docs for hung_task_detect_count
  hung_task: add detect count for hung tasks
  dma-buf: use atomic64_inc_return() in dma_buf_getfile()
  fs/proc/kcore.c: fix coccinelle reported ERROR instances
  resource: avoid unnecessary resource tree walking in __region_intersects()
  ocfs2: remove unused errmsg function and table
  ocfs2: cluster: fix a typo
  lib/scatterlist: use sg_phys() helper
  checkpatch: always parse orig_commit in fixes tag
  nilfs2: convert metadata aops from writepage to writepages
  nilfs2: convert nilfs_recovery_copy_block() to take a folio
  nilfs2: convert nilfs_page_count_clean_buffers() to take a folio
  nilfs2: remove nilfs_writepage
  nilfs2: convert checkpoint file to be folio-based
  ...
---

f5f4745a7f057b58c9728ee4e2c5d6d79f382fe7
diff --cc kernel/auditsc.c
index 91afdd0d036e,7adc67d5aafb..279ba5c420a4
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@@ -2728,8 -2729,8 +2728,8 @@@ void __audit_ptrace(struct task_struct 
  	context->target_auid = audit_get_loginuid(t);
  	context->target_uid = task_uid(t);
  	context->target_sessionid = audit_get_sessionid(t);
 -	security_task_getsecid_obj(t, &context->target_sid);
 +	security_task_getlsmprop_obj(t, &context->target_ref);
- 	memcpy(context->target_comm, t->comm, TASK_COMM_LEN);
+ 	strscpy(context->target_comm, t->comm);
  }
  
  /**
@@@ -2755,8 -2756,8 +2755,8 @@@ int audit_signal_info_syscall(struct ta
  		ctx->target_auid = audit_get_loginuid(t);
  		ctx->target_uid = t_uid;
  		ctx->target_sessionid = audit_get_sessionid(t);
 -		security_task_getsecid_obj(t, &ctx->target_sid);
 +		security_task_getlsmprop_obj(t, &ctx->target_ref);
- 		memcpy(ctx->target_comm, t->comm, TASK_COMM_LEN);
+ 		strscpy(ctx->target_comm, t->comm);
  		return 0;
  	}
  
@@@ -2776,8 -2777,8 +2776,8 @@@
  	axp->target_auid[axp->pid_count] = audit_get_loginuid(t);
  	axp->target_uid[axp->pid_count] = t_uid;
  	axp->target_sessionid[axp->pid_count] = audit_get_sessionid(t);
 -	security_task_getsecid_obj(t, &axp->target_sid[axp->pid_count]);
 +	security_task_getlsmprop_obj(t, &axp->target_ref[axp->pid_count]);
- 	memcpy(axp->target_comm[axp->pid_count], t->comm, TASK_COMM_LEN);
+ 	strscpy(axp->target_comm[axp->pid_count], t->comm);
  	axp->pid_count++;
  
  	return 0;
diff --cc lib/Makefile
index b393dd8151e2,cc26f81722a5..8000f2270462
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -35,10 -35,12 +35,12 @@@ lib-y := ctype.o string.o vsprintf.o cm
  	 is_single_threaded.o plist.o decompress.o kobject_uevent.o \
  	 earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
  	 nmi_backtrace.o win_minmax.o memcat_p.o \
- 	 buildid.o objpool.o union_find.o iomem_copy.o
 -	 buildid.o objpool.o
++	 buildid.o objpool.o iomem_copy.o
  
+ lib-$(CONFIG_UNION_FIND) += union_find.o
  lib-$(CONFIG_PRINTK) += dump_stack.o
  lib-$(CONFIG_SMP) += cpumask.o
+ lib-$(CONFIG_MIN_HEAP) += min_heap.o
  
  lib-y	+= kobject.o klist.o
  obj-y	+= lockref.o