Thread (34 messages) 34 messages, 4 authors, 2020-07-03

Re: linux-next: umh: fix processed error when UMH_WAIT_PROC is used seems to break linux bridge on s390x (bisected)

From: Christian Borntraeger <hidden>
Date: 2020-06-25 13:27:33
Also in: bridge, keyrings, linux-fsdevel, linux-nfs, linux-s390, linux-security-module, lkml


On 24.06.20 20:37, Christian Borntraeger wrote:
quoted hunk ↗ jump to hunk

On 24.06.20 20:32, Christian Borntraeger wrote:
[...]> 
quoted
So the translations look correct. But your change is actually a sematic change
if(ret) will only trigger if there is an error
if (KWIFEXITED(ret)) will always trigger when the process ends. So we will always overwrite -ECHILD
and we did not do it before. 
So the right fix is
diff --git a/kernel/umh.c b/kernel/umh.c
index f81e8698e36e..a3a3196e84d1 100644
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -154,7 +154,7 @@ static void call_usermodehelper_exec_sync(struct subprocess_info *sub_info)
                 * the real error code is already in sub_info->retval or
                 * sub_info->retval is 0 anyway, so don't mess with it then.
                 */
-               if (KWIFEXITED(ret))
+               if (KWEXITSTATUS(ret))
                        sub_info->retval = KWEXITSTATUS(ret);
        }
Ping. Shall I send this as a proper patch or are we merging this fixup in Andrews patch queue?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help