From 43275cc3fec34a0fe96877e9105256af6205e0d0 Mon Sep 17 00:00:00 2001
From: Igor Todorovski <itodorov@ca.ibm.com>
Date: Mon, 30 Sep 2024 13:42:42 -0400
Subject: [PATCH] Add superkill support

---
 stable-patches/kill.def.patch | 124 ++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 stable-patches/kill.def.patch

diff --git a/stable-patches/kill.def.patch b/stable-patches/kill.def.patch
new file mode 100644
index 0000000..fee6236
--- /dev/null
+++ b/stable-patches/kill.def.patch
@@ -0,0 +1,124 @@
+diff --git a/builtins/kill.def b/builtins/kill.def
+index c1ea14b8..bf7d01c2 100644
+--- a/builtins/kill.def
++++ b/builtins/kill.def
+@@ -22,7 +22,7 @@ $PRODUCES kill.c
+ 
+ $BUILTIN kill
+ $FUNCTION kill_builtin
+-$SHORT_DOC kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
++$SHORT_DOC kill [-s sigspec | -n signum | -K | -sigspec] pid | jobspec ... or kill -l [sigspec]
+ Send a signal to a job.
+ 
+ Send the processes identified by PID or JOBSPEC the signal named by
+@@ -32,9 +32,11 @@ SIGTERM is assumed.
+ Options:
+   -s sig	SIG is a signal name
+   -n sig	SIG is a signal number
+-  -l	list the signal names; if arguments follow `-l' they are
+-		assumed to be signal numbers for which names should be listed
+-  -L	synonym for -l
++  -K      Sends a superkill signal to force the ending of a process.
++          A kill signal must be sent prior to sending the superkill signal.
++  -l      list the signal names; if arguments follow `-l' they are
++	      	assumed to be signal numbers for which names should be listed
++  -L      synonym for -l
+ 
+ Kill is a shell builtin for two reasons: it allows job IDs to be used
+ instead of process IDs, and allows processes to be killed if the limit
+@@ -71,6 +73,7 @@ extern int errno;
+ #endif /* !errno */
+ 
+ static void kill_error (pid_t, int);
++static void kill_error2 (pid_t pid, int e, int e2);
+ 
+ #if !defined (CONTINUE_AFTER_KILL_ERROR)
+ #  define CONTINUE_OR_FAIL return (EXECUTION_FAILURE)
+@@ -84,11 +87,13 @@ static void kill_error (pid_t, int);
+ int
+ kill_builtin (WORD_LIST *list)
+ {
+-  int sig, any_succeeded, listing, saw_signal, dflags;
++  int sig, any_succeeded, listing, saw_signal, dflags, superkill_flag;
+   char *sigspec, *word;
+   pid_t pid;
+   intmax_t pid_value;
+ 
++  superkill_flag = 0;
++
+   if (list == 0)
+     {
+       builtin_usage ();
+@@ -111,6 +116,12 @@ kill_builtin (WORD_LIST *list)
+ 	  listing++;
+ 	  list = list->next;
+ 	}
++      /* Set the flag if -K option is found */
++      else if (ISOPTION (word, 'K'))
++	{
++	  superkill_flag = 1;
++	  list = list->next;
++	}
+       else if (ISOPTION (word, 's') || ISOPTION (word, 'n'))
+ 	{
+ 	  list = list->next;
+@@ -192,8 +203,17 @@ use_sigspec:
+       if (*word && valid_number (list->word->word, &pid_value) && (pid_value == (pid_t)pid_value))
+ 	{
+ 	  pid = (pid_t) pid_value;
++    /* If the superkill flag is set, call __superkill for each PID */
++      if (superkill_flag)
++	{
++	  if (__superkill(pid) < 0)
++	    {
++		    kill_error2 (pid, errno, __errno2());
++	      CONTINUE_OR_FAIL;
++	    }
++	}
+ 
+-	  if (kill_pid (pid, sig, pid < -1) < 0)
++	  else if (kill_pid (pid, sig, pid < -1) < 0)
+ 	    {
+ 	      if (errno == EINVAL)
+ 		sh_invalidsig (sigspec);
+@@ -237,7 +257,17 @@ use_sigspec:
+ 
+ 	  UNBLOCK_CHILD (oset);
+ 
+-	  if (kill_pid (pid, sig, 1) < 0)
++    /* If the superkill flag is set, call __superkill for each PID */
++      if (superkill_flag)
++	{
++	  if (__superkill(pid) < 0) /* Call __superkill before regular kill */
++	    {
++	      sh_badpid (list->word->word); /* Handle failure for __superkill */
++	      CONTINUE_OR_FAIL;
++	    }
++	}
++
++	 else if (kill_pid (pid, sig, 1) < 0)
+ 	    {
+ 	      if (errno == EINVAL)
+ 		sh_invalidsig (sigspec);
+@@ -271,3 +301,21 @@ kill_error (pid_t pid, int e)
+     x = _("Unknown error");
+   builtin_error ("(%ld) - %s", (long)pid, x);
+ }
++
++static void
++kill_error2 (pid_t pid, int e, int e2)
++{
++  char *x;
++
++  x = strerror (e);
++  if (x == 0)
++    x = _("Unknown error");
++
++if ((e== EINVAL) &&
++  ((e2 & 0x0000FFFF) == 1496)) {
++  builtin_error ("(%ld) - %s", (long)pid, "Cannot superkill without prior KILL signal to process.");
++ } else {
++  builtin_error ("(%ld) - %s - (ERRNO2: %x)", (long)pid, x, e2);
++  }
++
++}