| Message ID | m1czubqqz0.fsf_-_@fess.ebiederm.org |
|---|---|
| State | New |
| Headers | show |
| Series | signal: Move si_trapno into the _si_fault union | expand |
On Sat, 1 May 2021 at 01:43, Eric W. Biederman <ebiederm@xmission.com> wrote: > > It helps to know which part of the siginfo structure the siginfo_layout > value is talking about. Your Signed-off-by seems to be missing. Otherwise, Acked-by: Marco Elver <elver@google.com> > --- > fs/signalfd.c | 2 +- > include/linux/signal.h | 2 +- > kernel/signal.c | 10 +++++----- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/fs/signalfd.c b/fs/signalfd.c > index e87e59581653..83130244f653 100644 > --- a/fs/signalfd.c > +++ b/fs/signalfd.c > @@ -132,7 +132,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, > new.ssi_addr = (long) kinfo->si_addr; > new.ssi_addr_lsb = (short) kinfo->si_addr_lsb; > break; > - case SIL_PERF_EVENT: > + case SIL_FAULT_PERF_EVENT: > new.ssi_addr = (long) kinfo->si_addr; > new.ssi_perf = kinfo->si_perf; > break; > diff --git a/include/linux/signal.h b/include/linux/signal.h > index 5160fd45e5ca..ed896d790e46 100644 > --- a/include/linux/signal.h > +++ b/include/linux/signal.h > @@ -44,7 +44,7 @@ enum siginfo_layout { > SIL_FAULT_MCEERR, > SIL_FAULT_BNDERR, > SIL_FAULT_PKUERR, > - SIL_PERF_EVENT, > + SIL_FAULT_PERF_EVENT, > SIL_CHLD, > SIL_RT, > SIL_SYS, > diff --git a/kernel/signal.c b/kernel/signal.c > index 0517ff950d38..690921960d8b 100644 > --- a/kernel/signal.c > +++ b/kernel/signal.c > @@ -1198,7 +1198,7 @@ static inline bool has_si_pid_and_uid(struct kernel_siginfo *info) > case SIL_FAULT_MCEERR: > case SIL_FAULT_BNDERR: > case SIL_FAULT_PKUERR: > - case SIL_PERF_EVENT: > + case SIL_FAULT_PERF_EVENT: > case SIL_SYS: > ret = false; > break; > @@ -2553,7 +2553,7 @@ static void hide_si_addr_tag_bits(struct ksignal *ksig) > case SIL_FAULT_MCEERR: > case SIL_FAULT_BNDERR: > case SIL_FAULT_PKUERR: > - case SIL_PERF_EVENT: > + case SIL_FAULT_PERF_EVENT: > ksig->info.si_addr = arch_untagged_si_addr( > ksig->info.si_addr, ksig->sig, ksig->info.si_code); > break; > @@ -3242,7 +3242,7 @@ enum siginfo_layout siginfo_layout(unsigned sig, int si_code) > layout = SIL_FAULT_PKUERR; > #endif > else if ((sig == SIGTRAP) && (si_code == TRAP_PERF)) > - layout = SIL_PERF_EVENT; > + layout = SIL_FAULT_PERF_EVENT; > } > else if (si_code <= NSIGPOLL) > layout = SIL_POLL; > @@ -3364,7 +3364,7 @@ void copy_siginfo_to_external32(struct compat_siginfo *to, > to->si_addr = ptr_to_compat(from->si_addr); > to->si_pkey = from->si_pkey; > break; > - case SIL_PERF_EVENT: > + case SIL_FAULT_PERF_EVENT: > to->si_addr = ptr_to_compat(from->si_addr); > to->si_perf = from->si_perf; > break; > @@ -3440,7 +3440,7 @@ static int post_copy_siginfo_from_user32(kernel_siginfo_t *to, > to->si_addr = compat_ptr(from->si_addr); > to->si_pkey = from->si_pkey; > break; > - case SIL_PERF_EVENT: > + case SIL_FAULT_PERF_EVENT: > to->si_addr = compat_ptr(from->si_addr); > to->si_perf = from->si_perf; > break; > -- > 2.30.1 >
diff --git a/fs/signalfd.c b/fs/signalfd.c index e87e59581653..83130244f653 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c @@ -132,7 +132,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, new.ssi_addr = (long) kinfo->si_addr; new.ssi_addr_lsb = (short) kinfo->si_addr_lsb; break; - case SIL_PERF_EVENT: + case SIL_FAULT_PERF_EVENT: new.ssi_addr = (long) kinfo->si_addr; new.ssi_perf = kinfo->si_perf; break; diff --git a/include/linux/signal.h b/include/linux/signal.h index 5160fd45e5ca..ed896d790e46 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -44,7 +44,7 @@ enum siginfo_layout { SIL_FAULT_MCEERR, SIL_FAULT_BNDERR, SIL_FAULT_PKUERR, - SIL_PERF_EVENT, + SIL_FAULT_PERF_EVENT, SIL_CHLD, SIL_RT, SIL_SYS, diff --git a/kernel/signal.c b/kernel/signal.c index 0517ff950d38..690921960d8b 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1198,7 +1198,7 @@ static inline bool has_si_pid_and_uid(struct kernel_siginfo *info) case SIL_FAULT_MCEERR: case SIL_FAULT_BNDERR: case SIL_FAULT_PKUERR: - case SIL_PERF_EVENT: + case SIL_FAULT_PERF_EVENT: case SIL_SYS: ret = false; break; @@ -2553,7 +2553,7 @@ static void hide_si_addr_tag_bits(struct ksignal *ksig) case SIL_FAULT_MCEERR: case SIL_FAULT_BNDERR: case SIL_FAULT_PKUERR: - case SIL_PERF_EVENT: + case SIL_FAULT_PERF_EVENT: ksig->info.si_addr = arch_untagged_si_addr( ksig->info.si_addr, ksig->sig, ksig->info.si_code); break; @@ -3242,7 +3242,7 @@ enum siginfo_layout siginfo_layout(unsigned sig, int si_code) layout = SIL_FAULT_PKUERR; #endif else if ((sig == SIGTRAP) && (si_code == TRAP_PERF)) - layout = SIL_PERF_EVENT; + layout = SIL_FAULT_PERF_EVENT; } else if (si_code <= NSIGPOLL) layout = SIL_POLL; @@ -3364,7 +3364,7 @@ void copy_siginfo_to_external32(struct compat_siginfo *to, to->si_addr = ptr_to_compat(from->si_addr); to->si_pkey = from->si_pkey; break; - case SIL_PERF_EVENT: + case SIL_FAULT_PERF_EVENT: to->si_addr = ptr_to_compat(from->si_addr); to->si_perf = from->si_perf; break; @@ -3440,7 +3440,7 @@ static int post_copy_siginfo_from_user32(kernel_siginfo_t *to, to->si_addr = compat_ptr(from->si_addr); to->si_pkey = from->si_pkey; break; - case SIL_PERF_EVENT: + case SIL_FAULT_PERF_EVENT: to->si_addr = compat_ptr(from->si_addr); to->si_perf = from->si_perf; break;