| Message ID | 20210505141101.11519-9-ebiederm@xmission.com |
|---|---|
| State | New |
| Headers | show |
| Series | signal: sort out si_trapno and si_perf | expand |
On Wed, 5 May 2021 at 16:11, Eric W. Beiderman <ebiederm@xmission.com> wrote: > From: "Eric W. Biederman" <ebiederm@xmission.com> > > It helps to know which part of the siginfo structure the siginfo_layout > value is talking about. > > v1: https://lkml.kernel.org/r/m18s4zs7nu.fsf_-_@fess.ebiederm.org > Acked-by: Marco Elver <elver@google.com> > Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Reviewed-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 7eaa8d84db4c..697c5fe58db8 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; > @@ -3243,7 +3243,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; > @@ -3365,7 +3365,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; > @@ -3441,7 +3441,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 > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20210505141101.11519-9-ebiederm%40xmission.com.
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 7eaa8d84db4c..697c5fe58db8 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; @@ -3243,7 +3243,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; @@ -3365,7 +3365,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; @@ -3441,7 +3441,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;