[Devel] [PATCH RHEL COMMIT] ve/itimer: add ve_name to warning for a NULL new_value

Konstantin Khorenko khorenko at virtuozzo.com
Fri Sep 24 15:48:52 MSK 2021


The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after ark-5.14
------>
commit 4483316df30260d9d2754461113d491a70d8253f
Author: Dmitry Safonov <0x7f454c46 at gmail.com>
Date:   Fri Sep 24 15:48:52 2021 +0300

    ve/itimer: add ve_name to warning for a NULL new_value
    
    The host admin may be confused by warning in dmesg with only
    "comm", which may be anything a user in a container chooses.
    Add ve name to this warning.
    
    https://jira.sw.ru/browse/PSBM-49818
    
    Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
    
    Signed-off-by: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
    
    (cherry picked from vz8 commit 365d1a23d0218fba8dff0508bc011a6612cd2776)
    Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko at virtuozzo.com>
---
 kernel/time/itimer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index 00629e658ca1..721741b08381 100644
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -15,6 +15,7 @@
 #include <linux/hrtimer.h>
 #include <trace/events/timer.h>
 #include <linux/compat.h>
+#include <linux/ve.h>
 
 #include <linux/uaccess.h>
 
@@ -341,9 +342,9 @@ SYSCALL_DEFINE3(setitimer, int, which, struct __kernel_old_itimerval __user *, v
 			return error;
 	} else {
 		memset(&set_buffer, 0, sizeof(set_buffer));
-		printk_once(KERN_WARNING "%s calls setitimer() with new_value NULL pointer."
+		printk_once(KERN_WARNING "cmd: %s CT: %s calls setitimer() with new_value NULL pointer."
 			    " Misfeature support will be removed\n",
-			    current->comm);
+			    current->comm, task_ve_name(current));
 	}
 
 	error = do_setitimer(which, &set_buffer, ovalue ? &get_buffer : NULL);


More information about the Devel mailing list