Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 111dbe0c8a21dffa473239861be47ebc87f593b3

Authored by Björn Steinbrink
Committed by Linus Torvalds
1 parent 3e26a423e7
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] Fix ____call_usermodehelper errors being silently ignored 

If ____call_usermodehelper fails, we're not interested in the child
process' exit value, but the real error, so let's stop wait_for_helper from
overwriting it in that case.

Issue discovered by Benedikt Böhm while working on a Linux-VServer usermode
helper.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 11 additions and 1 deletions Side-by-side Diff

... ... @@ -176,6 +176,8 @@
176 176 if (pid < 0) {
177 177 sub_info->retval = pid;
178 178 } else {
  179 + int ret;
  180 +
179 181 /*
180 182 * Normally it is bogus to call wait4() from in-kernel because
181 183 * wait4() wants to write the exit code to a userspace address.
... ... @@ -185,7 +187,15 @@
185 187 *
186 188 * Thus the __user pointer cast is valid here.
187 189 */
188   - sys_wait4(pid, (int __user *) &sub_info->retval, 0, NULL);
  190 + sys_wait4(pid, (int __user *)&ret, 0, NULL);
  191 +
  192 + /*
  193 + * If ret is 0, either ____call_usermodehelper failed and the
  194 + * real error code is already in sub_info->retval or
  195 + * sub_info->retval is 0 anyway, so don't mess with it then.
  196 + */
  197 + if (ret)
  198 + sub_info->retval = ret;
189 199 }
190 200  
191 201 complete(sub_info->complete);