[rocky8_10] History rebuild for kernel-4.18.0-553.69.1.el8_10

Kconfig

@@ -20,4 +20,10 @@ config RH_KABI_SIZE_ALIGN_CHECKS
 	  This option enables more stringent kabi checks. Those must be disable
 	  in case of a debug-build because they allow to change struct sizes.
 
+config RH_KABI_STABLE_ASM_OFFSETS
+	bool "Enables asm-offsets.c constant stabilization"
+	default n
+	help
+	  This option extends check-kabi to test a subset of asm-offsets.c
+	  constants.
 

Makefile.rhelver

@@ -12,7 +12,7 @@ RHEL_MINOR = 10
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 553.62.1
+RHEL_RELEASE = 553.69.1
 
 #
 # ZSTREAM

arch/x86/kernel/alternative.c

@@ -801,9 +801,10 @@ __ro_after_init unsigned long poking_addr;
 
 static void *__text_poke(void *addr, const void *opcode, size_t len)
 {
+	bool cross_page_boundary = offset_in_page(addr) + len > PAGE_SIZE;
+	struct page *pages[2] = {NULL, NULL};
 	unsigned long flags;
 	char *vaddr;
-	struct page *pages[2];
 	int i;
 
 	/*
@@ -814,21 +815,28 @@ static void *__text_poke(void *addr, const void *opcode, size_t len)
 
 	if (!core_kernel_text((unsigned long)addr)) {
 		pages[0] = vmalloc_to_page(addr);
-		pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
+		if (cross_page_boundary)
+			pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
 	} else {
 		pages[0] = virt_to_page(addr);
 		WARN_ON(!PageReserved(pages[0]));
-		pages[1] = virt_to_page(addr + PAGE_SIZE);
+		if (cross_page_boundary)
+			pages[1] = virt_to_page(addr + PAGE_SIZE);
 	}
-	BUG_ON(!pages[0]);
+	/*
+	 * If something went wrong, crash and burn since recovery paths are not
+	 * implemented.
+	 */
+	BUG_ON(!pages[0] || (cross_page_boundary && !pages[1]));
+
 	local_irq_save(flags);
 	set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
-	if (pages[1])
+	if (cross_page_boundary)
 		set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
 	vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
 	memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
 	clear_fixmap(FIX_TEXT_POKE0);
-	if (pages[1])
+	if (cross_page_boundary)
 		clear_fixmap(FIX_TEXT_POKE1);
 	local_flush_tlb();
 	sync_core();

ciq/ciq_backports/kernel-4.18.0-553.63.1.el8_10/9ac8ba46.failed

@@ -0,0 +1,81 @@
+fs: dlm: handle -EINVAL as log_error()
+
+jira LE-3629
+Rebuild_History Non-Buildable kernel-4.18.0-553.63.1.el8_10
+commit-author Alexander Aring <[email protected]>
+commit 9ac8ba46a701b863be3f197d7eece4c635d0afe4
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-4.18.0-553.63.1.el8_10/9ac8ba46.failed
+
+If the user generates -EINVAL it's probably because they are
+using DLM incorrectly.  Change the log level to make these
+errors more visible.
+
+	Signed-off-by: Alexander Aring <[email protected]>
+	Signed-off-by: David Teigland <[email protected]>
+(cherry picked from commit 9ac8ba46a701b863be3f197d7eece4c635d0afe4)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	fs/dlm/lock.c
+diff --cc fs/dlm/lock.c
+index 0733727c255c,354f79254d62..000000000000
+--- a/fs/dlm/lock.c
++++ b/fs/dlm/lock.c
+@@@ -2920,11 -2895,24 +2920,27 @@@ static int validate_lock_args(struct dl
+  	lkb->lkb_lksb = args->lksb;
+  	lkb->lkb_lvbptr = args->lksb->sb_lvbptr;
+  	lkb->lkb_ownpid = (int) current->pid;
+ -#ifdef CONFIG_DLM_DEPRECATED_API
+  	lkb->lkb_timeout_cs = args->timeout;
+ -#endif
+  	rv = 0;
+   out:
+++<<<<<<< HEAD
+ +	if (rv)
+ +		log_debug(ls, "validate_lock_args %d %x %x %x %d %d %s",
+++=======
++ 	switch (rv) {
++ 	case 0:
++ 		break;
++ 	case -EINVAL:
++ 		/* annoy the user because dlm usage is wrong */
++ 		WARN_ON(1);
++ 		log_error(ls, "%s %d %x %x %x %d %d %s", __func__,
++ 			  rv, lkb->lkb_id, lkb->lkb_flags, args->flags,
++ 			  lkb->lkb_status, lkb->lkb_wait_type,
++ 			  lkb->lkb_resource->res_name);
++ 		break;
++ 	default:
++ 		log_debug(ls, "%s %d %x %x %x %d %d %s", __func__,
+++>>>>>>> 9ac8ba46a701 (fs: dlm: handle -EINVAL as log_error())
+  			  rv, lkb->lkb_id, lkb->lkb_flags, args->flags,
+  			  lkb->lkb_status, lkb->lkb_wait_type,
+  			  lkb->lkb_resource->res_name);
+@@@ -3060,8 -3051,19 +3079,24 @@@ static int validate_unlock_args(struct 
+  	lkb->lkb_astparam = args->astparam;
+  	rv = 0;
+   out:
+++<<<<<<< HEAD
+ +	if (rv)
+ +		log_debug(ls, "validate_unlock_args %d %x %x %x %x %d %s", rv,
+++=======
++ 	switch (rv) {
++ 	case 0:
++ 		break;
++ 	case -EINVAL:
++ 		/* annoy the user because dlm usage is wrong */
++ 		WARN_ON(1);
++ 		log_error(ls, "%s %d %x %x %x %x %d %s", __func__, rv,
++ 			  lkb->lkb_id, lkb->lkb_flags, lkb->lkb_exflags,
++ 			  args->flags, lkb->lkb_wait_type,
++ 			  lkb->lkb_resource->res_name);
++ 		break;
++ 	default:
++ 		log_debug(ls, "%s %d %x %x %x %x %d %s", __func__, rv,
+++>>>>>>> 9ac8ba46a701 (fs: dlm: handle -EINVAL as log_error())
+  			  lkb->lkb_id, lkb->lkb_flags, lkb->lkb_exflags,
+  			  args->flags, lkb->lkb_wait_type,
+  			  lkb->lkb_resource->res_name);
+* Unmerged path fs/dlm/lock.c

ciq/ciq_backports/kernel-4.18.0-553.63.1.el8_10/b98333c6.failed

@@ -0,0 +1,74 @@
+dlm: fix possible lkb_resource null dereference
+
+jira LE-3629
+Rebuild_History Non-Buildable kernel-4.18.0-553.63.1.el8_10
+commit-author Alexander Aring <[email protected]>
+commit b98333c67daf887c724cd692e88e2db9418c0861
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-4.18.0-553.63.1.el8_10/b98333c6.failed
+
+This patch fixes a possible null pointer dereference when this function is
+called from request_lock() as lkb->lkb_resource is not assigned yet,
+only after validate_lock_args() by calling attach_lkb(). Another issue
+is that a resource name could be a non printable bytearray and we cannot
+assume to be ASCII coded.
+
+The log functionality is probably never being hit when DLM is used in
+normal way and no debug logging is enabled. The null pointer dereference
+can only occur on a new created lkb that does not have the resource
+assigned yet, it probably never hits the null pointer dereference but we
+should be sure that other changes might not change this behaviour and we
+actually can hit the mentioned null pointer dereference.
+
+In this patch we just drop the printout of the resource name, the lkb id
+is enough to make a possible connection to a resource name if this
+exists.
+
+	Signed-off-by: Alexander Aring <[email protected]>
+	Signed-off-by: David Teigland <[email protected]>
+(cherry picked from commit b98333c67daf887c724cd692e88e2db9418c0861)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	fs/dlm/lock.c
+diff --cc fs/dlm/lock.c
+index 0733727c255c,dddedaef5e93..000000000000
+--- a/fs/dlm/lock.c
++++ b/fs/dlm/lock.c
+@@@ -2920,14 -2853,25 +2920,34 @@@ static int validate_lock_args(struct dl
+  	lkb->lkb_lksb = args->lksb;
+  	lkb->lkb_lvbptr = args->lksb->sb_lvbptr;
+  	lkb->lkb_ownpid = (int) current->pid;
+ +	lkb->lkb_timeout_cs = args->timeout;
+  	rv = 0;
+   out:
+++<<<<<<< HEAD
+ +	if (rv)
+ +		log_debug(ls, "validate_lock_args %d %x %x %x %d %d %s",
+ +			  rv, lkb->lkb_id, lkb->lkb_flags, args->flags,
+ +			  lkb->lkb_status, lkb->lkb_wait_type,
+ +			  lkb->lkb_resource->res_name);
+++=======
++ 	switch (rv) {
++ 	case 0:
++ 		break;
++ 	case -EINVAL:
++ 		/* annoy the user because dlm usage is wrong */
++ 		WARN_ON(1);
++ 		log_error(ls, "%s %d %x %x %x %d %d", __func__,
++ 			  rv, lkb->lkb_id, dlm_iflags_val(lkb), args->flags,
++ 			  lkb->lkb_status, lkb->lkb_wait_type);
++ 		break;
++ 	default:
++ 		log_debug(ls, "%s %d %x %x %x %d %d", __func__,
++ 			  rv, lkb->lkb_id, dlm_iflags_val(lkb), args->flags,
++ 			  lkb->lkb_status, lkb->lkb_wait_type);
++ 		break;
++ 	}
++ 
+++>>>>>>> b98333c67daf (dlm: fix possible lkb_resource null dereference)
+  	return rv;
+  }
+
+* Unmerged path fs/dlm/lock.c