colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #238786 from figsoda/graphene

Browse Source 
graphene-hardened-malloc: refactor
This commit is contained in:
Weijia Wang 2023-06-21 00:06:42 +03:00 committed by GitHub
commit 8407b20a4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/graphene-hardened-malloc/default.nix
View File

@ -7,23 +7,21 @@
, stress-ng , stress-ng
}: }:
lib.fix (self: stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "graphene-hardened-malloc"; pname = "graphene-hardened-malloc";
version = "11"; version = "11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GrapheneOS"; owner = "GrapheneOS";
repo = "hardened_malloc"; repo = "hardened_malloc";
rev = version; rev = finalAttrs.version;
sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU="; sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU=";
}; };
doCheck = true; doCheck = true;
nativeCheckInputs = [ python3 ]; nativeCheckInputs = [ python3 ];
# these tests cover use as a build-time-linked library # these tests cover use as a build-time-linked library
checkPhase = '' checkTarget = "test";
make test
'';
installPhase = '' installPhase = ''
install -Dm444 -t $out/include include/* install -Dm444 -t $out/include include/*
@ -38,8 +36,8 @@ lib.fix (self: stdenv.mkDerivation rec {
passthru = { passthru = {
ld-preload-tests = stdenv.mkDerivation { ld-preload-tests = stdenv.mkDerivation {
name = "${self.name}-ld-preload-tests"; name = "${finalAttrs.pname}-ld-preload-tests";
src = self.src; inherit (finalAttrs) src;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -66,13 +64,13 @@ lib.fix (self: stdenv.mkDerivation rec {
''; '';
}; };
tests = { tests = {
ld-preload = runCommand "ld-preload-test-run" {} '' ld-preload = runCommand "ld-preload-test-run" { } ''
${self}/bin/preload-hardened-malloc ${self.ld-preload-tests}/bin/run-tests ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${finalAttrs.passthru.ld-preload-tests}/bin/run-tests
touch $out touch $out
''; '';
# to compensate for the lack of tests of correct normal malloc operation # to compensate for the lack of tests of correct normal malloc operation
stress = runCommand "stress-test-run" {} '' stress = runCommand "stress-test-run" { } ''
${self}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \
--no-rand-seed \ --no-rand-seed \
--malloc 8 \ --malloc 8 \
--malloc-ops 1000000 \ --malloc-ops 1000000 \