History

Merge branch 'for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull siginfo fix from Eric Biederman: "During the merge window an issue with si_perf and the siginfo ABI came up. The alpha and sparc siginfo structure layout had changed with the addition of SIGTRAP TRAP_PERF and the new field si_perf. The reason only alpha and sparc were affected is that they are the only architectures that use si_trapno. Looking deeper it was discovered that si_trapno is used for only a few select signals on alpha and sparc, and that none of the other _sigfault fields past si_addr are used at all. Which means technically no regression on alpha and sparc. While the alignment concerns might be dismissed the abuse of si_errno by SIGTRAP TRAP_PERF does have the potential to cause regressions in existing userspace. While we still have time before userspace starts using and depending on the new definition siginfo for SIGTRAP TRAP_PERF this set of changes cleans up siginfo_t. - The si_trapno field is demoted from magic alpha and sparc status and made an ordinary union member of the _sigfault member of siginfo_t. Without moving it of course. - si_perf is replaced with si_perf_data and si_perf_type ending the abuse of si_errno. - Unnecessary additions to signalfd_siginfo are removed" * 'for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: signalfd: Remove SIL_PERF_EVENT fields from signalfd_siginfo signal: Deliver all of the siginfo perf data in _perf signal: Factor force_sig_perf out of perf_sigtrap signal: Implement SIL_FAULT_TRAPNO siginfo: Move si_trapno inside the union inside _si_fault

Linus Torvalds committed 5 years ago

Commit a0e31f32 parents c1f47eb 922e30112 files · +79 −73Browse files

Showing the changes to include/uapi/linux (2 of 12 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/perf_event.h +1 −1
  2. include/uapi/linux/signalfd.h +1 −3
include/uapi/linux/perf_event.h+1−1
@@ -464,7 +464,7 @@ struct perf_event_attr { · 463 unmodified lines
464464
465465 /*
466466 * User provided data if sigtrap=1, passed back to user via
467− * siginfo_t::si_perf, e.g. to permit user to identify the event.
467+ * siginfo_t::si_perf_data, e.g. to permit user to identify the event.
468468 */
469469 __u64 sig_data;
470470 };
include/uapi/linux/signalfd.h+1−3
@@ -39,8 +39,6 @@ struct signalfd_siginfo { · 38 unmodified lines
3939 __s32 ssi_syscall;
4040 __u64 ssi_call_addr;
4141 __u32 ssi_arch;
42− __u32 __pad3;
43− __u64 ssi_perf;
4442
4543 /*
4644 * Pad strcture to 128 bytes. Remember to update the
@@ -51,7 +49,7 @@ struct signalfd_siginfo { · 4 unmodified lines
5149 * comes out of a read(2) and we really don't want to have
5250 * a compat on read(2).
5351 */
54− __u8 __pad[16];
52+ __u8 __pad[28];
5553 };
5654
5755

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t