I have a multithreaded testcase that easily hits the BUG() in
fill_siginfo() by raise()'ing a signal it has blocked before
checkpoint. The value of si_code in this case is SI_TKILL.
This gets my testcase to pass, but I'm not sure it's a complete
solution... comments?
---
kernel/signal.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index e4ca9a6..cd25592 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2919,6 +2919,9 @@ static void fill_siginfo(struct ckpt_siginfo *si, siginfo_t *info)
si->_errno = info->si_errno;
si->code = info->si_code;
+ if (info->si_code < 0)
+ return;
+
/* TODO: convert info->si_uid to uid_objref */
switch (info->si_code & __SI_MASK) {
@@ -2953,7 +2956,8 @@ static void fill_siginfo(struct ckpt_siginfo *si, siginfo_t *info)
si->sigval_ptr = (unsigned long) info->si_ptr;
break;
default:
- BUG();
+ ckpt_debug("unknown si_code 0x%x\n", info->si_code);
+ break;
}
}
@@ -3002,7 +3006,7 @@ static int load_siginfo(siginfo_t *info, struct ckpt_siginfo *si)
info->si_ptr = (void __user *) (unsigned long) si->sigval_ptr;
break;
default:
- return -EINVAL;
+ break;
}
return 0;
--
1.6.0.2
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers
