linux-4.13: mark as insecure (+required generic changes)
extraMeta was being fed as passthru without being processed by stdenv, so without those changes, adding the security attribute would be useless.
This commit is contained in:
parent
561de381bc
commit
13797ff522
@ -118,7 +118,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
kernel = buildLinux {
|
kernel = buildLinux {
|
||||||
inherit version modDirVersion src kernelPatches stdenv;
|
inherit version modDirVersion src kernelPatches stdenv extraMeta;
|
||||||
|
|
||||||
configfile = configfile.nativeDrv or configfile;
|
configfile = configfile.nativeDrv or configfile;
|
||||||
|
|
||||||
@ -131,10 +131,7 @@ let
|
|||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
features = kernelFeatures;
|
features = kernelFeatures;
|
||||||
|
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
|
||||||
meta = kernel.meta // extraMeta;
|
|
||||||
|
|
||||||
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" "meta" ]);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
|
nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
|
||||||
|
@ -4,6 +4,12 @@ import ./generic.nix (args // rec {
|
|||||||
version = "4.13.16";
|
version = "4.13.16";
|
||||||
extraMeta.branch = "4.13";
|
extraMeta.branch = "4.13";
|
||||||
|
|
||||||
|
# TODO: perhaps try being more concrete (ideally CVE numbers).
|
||||||
|
extraMeta.knownVulnerabilities = [
|
||||||
|
"ALSA: usb-audio: Fix potential out-of-bound access at parsing SU"
|
||||||
|
"eCryptfs: use after free in ecryptfs_release_messaging()"
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||||
sha256 = "0cf7prqzl1ajbgl98w0symdyn0k5wl5xaf1l5ldgy6l083yg69dh";
|
sha256 = "0cf7prqzl1ajbgl98w0symdyn0k5wl5xaf1l5ldgy6l083yg69dh";
|
||||||
|
@ -39,6 +39,8 @@ in {
|
|||||||
config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile),
|
config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile),
|
||||||
# Cross-compiling config
|
# Cross-compiling config
|
||||||
crossConfig ? if allowImportFromDerivation then (readConfig crossConfigfile) else config,
|
crossConfig ? if allowImportFromDerivation then (readConfig crossConfigfile) else config,
|
||||||
|
# Use defaultMeta // extraMeta
|
||||||
|
extraMeta ? {},
|
||||||
# Whether to utilize the controversial import-from-derivation feature to parse the config
|
# Whether to utilize the controversial import-from-derivation feature to parse the config
|
||||||
allowImportFromDerivation ? false
|
allowImportFromDerivation ? false
|
||||||
}:
|
}:
|
||||||
@ -228,7 +230,7 @@ let
|
|||||||
maintainers.thoughtpolice
|
maintainers.thoughtpolice
|
||||||
];
|
];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
} // extraMeta;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user