Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8ae6797c0e8a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 77ed860114fc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 18, 2017

  1. socklog: disable shsgr test 

    Running the chkhsgr test on Hydra fails with
```
./chkshsgr || ( cat warn-shsgr; exit 1 )
Oops. Your getgroups() returned 0, and setgroups() failed; this means
that I can't reliably do my shsgr test. Please either ``make'' as root
or ``make'' while you're in one or more supplementary groups.
```

We just assume that our supported platforms have working
getgroups()/setgroups().
    @joachifm
    joachifm committed May 18, 2017
    Copy the full SHA
    d438cbb View commit details

  2. linux_hardened: enable checks on scatter-gather tables 

    Recommended by kspp
    @joachifm
    joachifm committed May 18, 2017
    Copy the full SHA
    77ed860 View commit details
Showing with 5 additions and 0 deletions.
  1. +1 −0 pkgs/os-specific/linux/kernel/hardened-config.nix
  2. +4 −0 pkgs/tools/system/socklog/default.nix
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/kernel/hardened-config.nix
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ ${optionalString (versionAtLeast version "4.10") ''
DEBUG_CREDENTIALS y
DEBUG_NOTIFIERS y
DEBUG_LIST y
DEBUG_SG y
HARDENED_USERCOPY y # Bounds check usercopy
4 changes: 4 additions & 0 deletions pkgs/tools/system/socklog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {

outputs = [ "out" "man" "doc" ];

postPatch = ''
sed -i src/TARGETS -e '/^chkshsgr/d'
'';

configurePhase = ''
echo "$NIX_CC/bin/cc $NIX_CFLAGS_COMPILE" >src/conf-cc
echo "$NIX_CC/bin/cc -s" >src/conf-ld