Commit fbee2a8a authored by Sophie Brun's avatar Sophie Brun

Merge branch 'debian' into kali/master

parents 02fb5a24 fa1f3e12
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
linux (5.3.9-3) unstable; urgency=medium
* [arm64,armhf,powerpc*,s390x] KVM: Add more exports to ABI ignore list
(fixes FTBFS)
-- Ben Hutchings <[email protected]> Tue, 19 Nov 2019 01:43:33 +0000
linux (5.3.9-2) unstable; urgency=medium
* [x86] Add mitigation for TSX Asynchronous Abort (CVE-2019-11135):
- x86/msr: Add the IA32_TSX_CTRL MSR
- x86/cpu: Add a helper function x86_read_arch_cap_msr()
- x86/cpu: Add a "tsx=" cmdline option with TSX disabled by default
- x86/speculation/taa: Add mitigation for TSX Async Abort
- x86/speculation/taa: Add sysfs reporting for TSX Async Abort
- kvm/x86: Export MDS_NO=0 to guests when TSX is enabled
- x86/tsx: Add "auto" option to the tsx= cmdline parameter
- x86/speculation/taa: Add documentation for TSX Async Abort
- x86/tsx: Add config options to set tsx=on|off|auto
- x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs
TSX is now disabled by default; see
Documentation/admin-guide/hw-vuln/tsx_async_abort.rst
* [x86] KVM: Add mitigation for Machine Check Error on Page Size Change
(aka iTLB multi-hit, CVE-2018-12207):
- kvm: x86, powerpc: do not allow clearing largepages debugfs entry
- x86/bugs: Add ITLB_MULTIHIT bug infrastructure
- x86/cpu: Add Tremont to the cpu vulnerability whitelist
- cpu/speculation: Uninline and export CPU mitigations helpers
- kvm: mmu: ITLB_MULTIHIT mitigation
- kvm: Add helper function for creating VM worker threads
- kvm: x86: mmu: Recovery of shattered NX large pages
- Documentation: Add ITLB_MULTIHIT documentation
* [x86] i915: Mitigate local privilege escalation on gen9 (CVE-2019-0155):
- drm/i915: Rename gen7 cmdparser tables
- drm/i915: Disable Secure Batches for gen6+
- drm/i915: Remove Master tables from cmdparser
- drm/i915: Add support for mandatory cmdparsing
- drm/i915: Support ro ppgtt mapped cmdparser shadow buffers
- drm/i915: Allow parsing of unsized batches
- drm/i915: Add gen9 BCS cmdparsing
- drm/i915/cmdparser: Use explicit goto for error paths
- drm/i915/cmdparser: Add support for backward jumps
- drm/i915/cmdparser: Ignore Length operands during command matching
- drm/i915/cmdparser: Fix jump whitelist clearing
* [x86] i915: Mitigate local denial-of-service on gen8/gen9 (CVE-2019-0154):
- drm/i915: Lower RM timeout to avoid DSI hard hangs
- drm/i915/gen8+: Add RC6 CTX corruption WA
-- Ben Hutchings <[email protected]> Tue, 12 Nov 2019 15:44:08 +0000
linux (5.3.9-1kali1) kali-experimental; urgency=medium
* Sync with Debian
This diff is collapsed.
......@@ -2,7 +2,6 @@
abiname: kali2
ignore-changes:
__cpuhp_*
__xive_vm_h_*
bpf_analyzer
cxl_*
dax_flush
......@@ -10,8 +9,6 @@ ignore-changes:
inet_add_protocol
inet_del_protocol
iommu_device_*
kvm_async_pf_task_wait
kvmppc_*
mm_iommu_*
mv_mbus_*
perf_*
......@@ -19,7 +16,6 @@ ignore-changes:
register_key_type
unregister_cxl_calls
*_hw_breakpoint
module:arch/x86/kvm/*
module:drivers/crypto/ccp/*
module:drivers/hv/*
module:drivers/gpu/drm/sun4i/*
......@@ -82,6 +78,22 @@ ignore-changes:
nf_nat_masquerade_ipv6_register_notifier
# ignore changes to hisi_sas/*
module:drivers/scsi/hisi_sas/*
# KVM internal
__gfn_*
__kvmhv_*
__kvm_*
__xive_vm_h_*
gfn_*
h_ipi_redirect
halt_poll_ns*
kvm_*
kvmhv_*
kvmppc_*
mark_page_dirty
vcpu_*
module:arch/powerpc/kvm/*
module:arch/s390/kvm/*
module:arch/x86/kvm/*
[base]
arches:
......
8c08b0523108af392d319194a736a2ee debian/bin/gencontrol.py
16e374b5c42a3c412e784cac1ace582f debian/build/version-info
97556399fc3d6cde682e83d30e4af1c3 debian/build/version-info
74b180a87aa1f6377d9bf8a10368c657 debian/templates/control.main.in
6d7a600c6ae1b00ebbe8b83c98aa2081 debian/templates/docs.meta.maintscript.in
1cfc49a285f1f37ce6415e811e5c737f debian/templates/control.image-unsigned.in
38004750aa03cea41d5d3aeafff16fcc debian/templates/image.preinst.in
ce8590d760adf6efb95181ec626c4aca debian/templates/control.headers.meta.in
8d761bd22edf6526eb7f98ebb5bd3c35 debian/templates/control.tools-unversioned.in
63c0d01ea032d0acfa5e069d31daa938 debian/templates/control.libc-dev.in
d86b25f11187a0dbf01990c3f60cbc76 debian/templates/control.tools-versioned.meta.in
edd0c695ee322eacb1a01a06aabb3142 debian/templates/image.meta.maintscript.in
358db3af53a223fe60ae89c7a481609f debian/templates/control.docs.meta.in
9f8b648cd44f92d233db433b9ffe1994 debian/templates/sourcebin.meta.maintscript.in
63c0d01ea032d0acfa5e069d31daa938 debian/templates/control.libc-dev.in
0c0569fd41e9c0069db7a300362ef26f debian/templates/tests-control.image.in
23a0cc457847e3eaa7124fe90a636260 debian/templates/control.image.in
0d7f6ea42f52d0a6013535a80111ee3e debian/templates/headers.postinst.in
814dda166c7e3ef02e6e259e805ac66a debian/templates/tests-control.image.in
33d71bfd398d2f9b3bc5c0193b67d17e debian/templates/tests-control.main.in
afb508873a44a1f196c2a525fec4b415 debian/templates/image.prerm.in
a4a60fc48b3240e46bbac6a1ddcaad30 debian/templates/image.postrm.in
0d7f6ea42f52d0a6013535a80111ee3e debian/templates/headers.postinst.in
51797b6c275eb14e99009e78553904cc debian/templates/perf.lintian-overrides.in
0524b5c0c4de9f636e8a6498b74d30da debian/templates/image-dbg.meta.maintscript.in
b5b99078d7e73c15ac6055496e33d1ec debian/templates/control.sourcebin.in
57685436e079bbef4f8bb6e8a2dfbf1b debian/templates/control.signed-template.in
219fcc38408093e1b074b58420d3760c debian/templates/perf.meta.maintscript.in
54426b6625c1bbf41ff6e05eebc06f89 debian/templates/image-dbg.lintian-overrides.in
6d7a600c6ae1b00ebbe8b83c98aa2081 debian/templates/docs.meta.maintscript.in
5343850f6529eabf019ff091376be476 debian/templates/control.tools-versioned.in
23a0cc457847e3eaa7124fe90a636260 debian/templates/control.image.in
eda4623fb10d5ba1cefa8502ebaeb0fd debian/templates/control.image-dbg.in
fe4456d48e3218fb8980c8577d03a7ae debian/templates/control.config.in
e5b409d92d8a99794e4ea81c0652f562 debian/templates/control.source.in
aa4db25a9c69d38f6f1887fda91354ef debian/templates/control.source.in
9e0964bc4fb31614901489ea0c24e1cf debian/templates/control.image.meta.in
54426b6625c1bbf41ff6e05eebc06f89 debian/templates/image-dbg.lintian-overrides.in
bff294ebfde22b550718545c6eb06a12 debian/templates/headers.meta.maintscript.in
6fea4e452a7a77e7063bb17051fff3a7 debian/templates/control.docs.in
98d67252f9a33d17a78aa37c29603b83 debian/templates/image-dbg.meta.lintian-overrides.in
578bb70eb1ed930f2cf8a774666b747f debian/templates/control.headers.featureset.in
33d71bfd398d2f9b3bc5c0193b67d17e debian/templates/tests-control.main.in
0327750d6696dee915a532aec73a0fd6 debian/templates/image.postinst.in
2b3995da9ebe7d2b1a1345241dd90c55 debian/templates/control.headers.in
3ed5eacba4270ffff579eb130377e0ce debian/templates/control.extra.in
5343850f6529eabf019ff091376be476 debian/templates/control.tools-versioned.in
817873a7b9fa61d433b2c39f6b2491de debian/templates/control.image-dbg.meta.in
6fea4e452a7a77e7063bb17051fff3a7 debian/templates/control.docs.in
fe4456d48e3218fb8980c8577d03a7ae debian/templates/control.config.in
4124ed9de89fd889d6cf997ee8da76f0 debian/templates/control.sourcebin.meta.in
103ea5fb237e376b511ba638afc41837 debian/templates/control.headers.arch.in
769a43efb579711359e12554e34d0baa debian/templates/image.meta.bug-presubj.in
018c70cb356926f66869c8034b4af511 debian/config/defines
d8f9c5a5c910b53c01d3a933a722d079 debian/config/i386/defines
e4675a95e0b11e580d5ca72c488f124e debian/config/defines
40b9e8b240189dd0cfa1e604cad7f4d7 debian/config/i386/defines
d08ab699e6a25ec0da4cb70efc0f2288 debian/config/ppc64el/defines
32e264f468daa991fa1bafce9e1eee3c debian/config/mips64el/defines
8f2e4969633ff660d026f2b7e02e6336 debian/config/sh3/defines
1f2029e9d0bc11b6bd7330810232b249 debian/config/mipsr6/defines
9d5d67c4ddd2a3110981eb90fd932acb debian/config/armhf/defines
ffaba8ecac9f33cdf38a83b6c6b5128e debian/config/amd64/defines
17cffb563e69117c33f93babd688aa2f debian/config/armhf/defines
4afb623a3e95d1da6e1406fa23d27569 debian/config/amd64/defines
1f1ed4a31b20a1ab483dd1357b30ed76 debian/config/mipsr6el/defines
b1750f23dea19ed03c8382341c924b53 debian/config/mips/defines
e0810ddd6e4add2a26c5668773b69d25 debian/config/sh4/defines
2a6719af2f5916db821358f96cc456f0 debian/config/arm64/defines
75134192a23b59b505f88d04d494ab71 debian/config/arm64/defines
e411d2dfe0018a7c40b6bf7efd45cd29 debian/config/mipsn32/defines
174058e52aced932bf02606d6cb5649c debian/config/mipsn32el/defines
366b94d652a66b437eabcd165bcc9610 debian/config/featureset-rt/defines
a50ff431517bddd759d53c0ad2850cb7 debian/config/riscv64/defines
8d317c1872f3bd8da4feae25a7c61df3 debian/config/sparc/defines
45a4ad93313c2066248987dfa59dd6da debian/config/powerpc/defines
cc0106a8c7720ed590829ebe41cb5051 debian/config/s390x/defines
02b96ff7eaa79ca2716eedf529222c58 debian/config/ppc64/defines
f4b2921156e7b1a038862f848fdfe48f debian/config/x32/defines
f425752f612c3c6693bc47c205dbf737 debian/config/mips64/defines
b3ef14a93ef9602bf951f55f806e2f6c debian/config/sparc64/defines
f53e736263ada56088198fd8598fe31a debian/config/mipsel/defines
a50ff431517bddd759d53c0ad2850cb7 debian/config/riscv64/defines
cfd152bc54eac192170da184212add48 debian/config/hppa/defines
e0810ddd6e4add2a26c5668773b69d25 debian/config/sh4/defines
47420e11eaad5f5ffd20b01b549696a8 debian/config/m68k/defines
cc0106a8c7720ed590829ebe41cb5051 debian/config/s390x/defines
35e886ad30d213e86b340eb759d25e0d debian/config/ia64/defines
882fb0fec3cbd0239817994223fa71e5 debian/config/mipsn32r6/defines
da871dd4234a8d1ed82d76fa536fa411 debian/config/alpha/defines
73e2f095b2485f95bc164bf685684a47 debian/config/mipsn32r6el/defines
da5923d139e450f4a3a8213a933dd781 debian/config/armel/defines
cfd152bc54eac192170da184212add48 debian/config/hppa/defines
45a4ad93313c2066248987dfa59dd6da debian/config/powerpc/defines
12718e7276cb5dd8085e0c05d9b4bbfb debian/config/armel/defines
2f649099bc889fdbccc9b2f72305681c debian/config/mips64r6/defines
3e673c1434c6132c73c0cfb4bfe38763 debian/config/arm64ilp32/defines
832f4a53a034eac58b25c90a813b4669 debian/config/mips64r6el/defines
......
From: Jon Bloomfield <[email protected]>
Date: Fri, 8 Jun 2018 08:53:46 -0700
Subject: drm/i915: Disable Secure Batches for gen6+
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-0155
commit 44157641d448cbc0c4b73c5231d2b911f0cb0427 upstream.
Retroactively stop reporting support for secure batches
through the api for gen6+ so that older binaries trigger
the fallback path instead.
Older binaries use secure batches pre gen6 to access resources
that are not available to normal usermode processes. However,
all known userspace explicitly checks for HAS_SECURE_BATCHES
before relying on the secure batch feature.
Since there are no known binaries relying on this for newer gens
we can kill secure batches from gen6, via I915_PARAM_HAS_SECURE_BATCHES.
v2: rebase (Mika)
v3: rebase (Mika)
Signed-off-by: Jon Bloomfield <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Dave Airlie <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Tyler Hicks <[email protected]>
Signed-off-by: Mika Kuoppala <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
---
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 12 ++++++++++--
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 1 +
3 files changed, 12 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -2351,6 +2351,7 @@ i915_gem_do_execbuffer(struct drm_device
struct drm_i915_gem_exec_object2 *exec,
struct drm_syncobj **fences)
{
+ struct drm_i915_private *i915 = to_i915(dev);
struct i915_execbuffer eb;
struct dma_fence *in_fence = NULL;
struct dma_fence *exec_fence = NULL;
@@ -2362,7 +2363,7 @@ i915_gem_do_execbuffer(struct drm_device
BUILD_BUG_ON(__EXEC_OBJECT_INTERNAL_FLAGS &
~__EXEC_OBJECT_UNKNOWN_FLAGS);
- eb.i915 = to_i915(dev);
+ eb.i915 = i915;
eb.file = file;
eb.args = args;
if (DBG_FORCE_RELOC || !(args->flags & I915_EXEC_NO_RELOC))
@@ -2382,8 +2383,15 @@ i915_gem_do_execbuffer(struct drm_device
eb.batch_flags = 0;
if (args->flags & I915_EXEC_SECURE) {
+ if (INTEL_GEN(i915) >= 11)
+ return -ENODEV;
+
+ /* Return -EPERM to trigger fallback code on old binaries. */
+ if (!HAS_SECURE_BATCHES(i915))
+ return -EPERM;
+
if (!drm_is_current_master(file) || !capable(CAP_SYS_ADMIN))
- return -EPERM;
+ return -EPERM;
eb.batch_flags |= I915_DISPATCH_SECURE;
}
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -387,7 +387,7 @@ static int i915_getparam_ioctl(struct dr
value = !!(dev_priv->caps.scheduler & I915_SCHEDULER_CAP_SEMAPHORES);
break;
case I915_PARAM_HAS_SECURE_BATCHES:
- value = capable(CAP_SYS_ADMIN);
+ value = HAS_SECURE_BATCHES(dev_priv) && capable(CAP_SYS_ADMIN);
break;
case I915_PARAM_CMD_PARSER_VERSION:
value = i915_cmd_parser_get_version(dev_priv);
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2249,6 +2249,7 @@ IS_SUBPLATFORM(const struct drm_i915_pri
#define HAS_LLC(dev_priv) (INTEL_INFO(dev_priv)->has_llc)
#define HAS_SNOOP(dev_priv) (INTEL_INFO(dev_priv)->has_snoop)
#define HAS_EDRAM(dev_priv) ((dev_priv)->edram_size_mb)
+#define HAS_SECURE_BATCHES(dev_priv) (INTEL_GEN(dev_priv) < 6)
#define HAS_WT(dev_priv) ((IS_HASWELL(dev_priv) || \
IS_BROADWELL(dev_priv)) && HAS_EDRAM(dev_priv))
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment