pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils Update xentools413 and xentools413 to 4.13.3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/4d1e19078372
branches: trunk
changeset: 449398:4d1e19078372
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Tue Mar 30 06:59:03 2021 +0000
description:
Update xentools413 and xentools413 to 4.13.3.
Changes since 4.13.2: inlcude security fixes for all XSA known to date
(up to XSA-369). Other minor bug fixes.
diffstat:
sysutils/xenkernel413/Makefile | 6 +-
sysutils/xenkernel413/distinfo | 18 +-
sysutils/xenkernel413/patches/patch-XSA348 | 356 --
sysutils/xenkernel413/patches/patch-XSA351 | 285 --
sysutils/xenkernel413/patches/patch-XSA355 | 25 -
sysutils/xenkernel413/patches/patch-XSA358 | 48 -
sysutils/xenkernel413/patches/patch-XSA359 | 42 -
sysutils/xenkernel413/patches/patch-XSA360 | 99 -
sysutils/xenkernel413/patches/patch-fixpvh | 40 +-
sysutils/xentools413/Makefile | 5 +-
sysutils/xentools413/distinfo | 23 +-
sysutils/xentools413/patches/patch-XSA115-c | 1755 --------------
sysutils/xentools413/patches/patch-XSA115-o | 711 -----
sysutils/xentools413/patches/patch-XSA322-c | 534 ----
sysutils/xentools413/patches/patch-XSA322-o | 112 -
sysutils/xentools413/patches/patch-XSA323 | 142 -
sysutils/xentools413/patches/patch-XSA324 | 50 -
sysutils/xentools413/patches/patch-XSA325 | 194 -
sysutils/xentools413/patches/patch-XSA330 | 68 -
sysutils/xentools413/patches/patch-XSA352 | 44 -
sysutils/xentools413/patches/patch-XSA353 | 91 -
sysutils/xentools413/patches/patch-XSA355 | 25 -
sysutils/xentools413/patches/patch-tools_xenpmd_xenpmd.c | 10 +-
23 files changed, 23 insertions(+), 4660 deletions(-)
diffs (truncated from 4829 to 300 lines):
diff -r fe866e91fcb1 -r 4d1e19078372 sysutils/xenkernel413/Makefile
--- a/sysutils/xenkernel413/Makefile Tue Mar 30 00:16:24 2021 +0000
+++ b/sysutils/xenkernel413/Makefile Tue Mar 30 06:59:03 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2021/02/03 22:27:16 bouyer Exp $
+# $NetBSD: Makefile,v 1.13 2021/03/30 06:59:03 bouyer Exp $
-VERSION= 4.13.2
-PKGREVISION= 5
+VERSION= 4.13.3
+#PKGREVISION= 0
DISTNAME= xen-${VERSION}
PKGNAME= xenkernel413-${VERSION}
CATEGORIES= sysutils
diff -r fe866e91fcb1 -r 4d1e19078372 sysutils/xenkernel413/distinfo
--- a/sysutils/xenkernel413/distinfo Tue Mar 30 00:16:24 2021 +0000
+++ b/sysutils/xenkernel413/distinfo Tue Mar 30 06:59:03 2021 +0000
@@ -1,17 +1,11 @@
-$NetBSD: distinfo,v 1.9 2021/02/03 22:27:16 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2021/03/30 06:59:03 bouyer Exp $
-SHA1 (xen413/xen-4.13.2.tar.gz) = d514f1de9582c58676420bb2c9fb1c765b44fbff
-RMD160 (xen413/xen-4.13.2.tar.gz) = 96727c20bd84338f8c67c7c584c01ef877bbcb18
-SHA512 (xen413/xen-4.13.2.tar.gz) = cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-Size (xen413/xen-4.13.2.tar.gz) = 39037826 bytes
+SHA1 (xen413/xen-4.13.3.tar.gz) = edcd1bd736afa7b3b3022a97ce8ff215219a90c2
+RMD160 (xen413/xen-4.13.3.tar.gz) = 08665b76171957017c312d5637f6921526a3675d
+SHA512 (xen413/xen-4.13.3.tar.gz) = 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
+Size (xen413/xen-4.13.3.tar.gz) = 39044539 bytes
SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
-SHA1 (patch-XSA348) = 70de325f88e004228d2b69b7ae3b4106175be1e0
-SHA1 (patch-XSA351) = edb0975ab0aa53d7a0ae7816fe170a081eea695e
-SHA1 (patch-XSA355) = 73ca5dff042a4a54b06af36e6ace7d09673c05f0
-SHA1 (patch-XSA358) = 71d5b2e3d19223b986b8572adfbe7355a3a03db6
-SHA1 (patch-XSA359) = 4b778a86fffbe0e2a364e1589d573bbc7c27ff99
-SHA1 (patch-XSA360) = c1aa4bdade4d3318bc2dffa83e359f66997b11df
-SHA1 (patch-fixpvh) = fd71e150e0b3a461875c02c4419dbfb30548d8f6
+SHA1 (patch-fixpvh) = eec14f19d0adc6d96035d6c711270bb375304660
SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6
SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac
SHA1 (patch-xen_arch_x86_Rules.mk) = 0bedfc53a128a87b6a249ae04fbdf6a053bfb70b
diff -r fe866e91fcb1 -r 4d1e19078372 sysutils/xenkernel413/patches/patch-XSA348
--- a/sysutils/xenkernel413/patches/patch-XSA348 Tue Mar 30 00:16:24 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,356 +0,0 @@
-$NetBSD: patch-XSA348,v 1.1 2020/12/16 17:15:22 bouyer Exp $
-
-From: Jan Beulich <jbeulich%suse.com@localhost>
-Subject: x86: replace reset_stack_and_jump_nolp()
-
-Move the necessary check into check_for_livepatch_work(), rather than
-mostly duplicating reset_stack_and_jump() for this purpose. This is to
-prevent an inflation of reset_stack_and_jump() flavors.
-
-Signed-off-by: Jan Beulich <jbeulich%suse.com@localhost>
-Reviewed-by: Juergen Gross <jgross%suse.com@localhost>
-
---- xen/arch/x86/domain.c.orig 2020-10-30 17:22:39.000000000 +0100
-+++ xen/arch/x86/domain.c 2020-11-10 17:51:10.894525721 +0100
-@@ -192,7 +192,7 @@ static void noreturn continue_idle_domai
- {
- /* Idle vcpus might be attached to non-idle units! */
- if ( !is_idle_domain(v->sched_unit->domain) )
-- reset_stack_and_jump_nolp(guest_idle_loop);
-+ reset_stack_and_jump(guest_idle_loop);
-
- reset_stack_and_jump(idle_loop);
- }
---- xen/arch/x86/hvm/svm/svm.c.orig 2020-10-30 17:22:39.000000000 +0100
-+++ xen/arch/x86/hvm/svm/svm.c 2020-11-10 17:51:10.898525723 +0100
-@@ -1032,7 +1032,7 @@ static void noreturn svm_do_resume(struc
-
- hvm_do_resume(v);
-
-- reset_stack_and_jump_nolp(svm_asm_do_resume);
-+ reset_stack_and_jump(svm_asm_do_resume);
- }
-
- void svm_vmenter_helper(const struct cpu_user_regs *regs)
---- xen/arch/x86/hvm/vmx/vmcs.c.orig 2020-05-18 18:53:09.000000000 +0200
-+++ xen/arch/x86/hvm/vmx/vmcs.c 2020-11-10 17:51:10.898525723 +0100
-@@ -1889,7 +1889,7 @@ void vmx_do_resume(struct vcpu *v)
- if ( host_cr4 != read_cr4() )
- __vmwrite(HOST_CR4, read_cr4());
-
-- reset_stack_and_jump_nolp(vmx_asm_do_vmentry);
-+ reset_stack_and_jump(vmx_asm_do_vmentry);
- }
-
- static inline unsigned long vmr(unsigned long field)
---- xen/arch/x86/pv/domain.c.orig 2020-10-30 17:22:39.000000000 +0100
-+++ xen/arch/x86/pv/domain.c 2020-11-10 17:51:10.898525723 +0100
-@@ -61,7 +61,7 @@ custom_runtime_param("pcid", parse_pcid)
- static void noreturn continue_nonidle_domain(struct vcpu *v)
- {
- check_wakeup_from_wait();
-- reset_stack_and_jump_nolp(ret_from_intr);
-+ reset_stack_and_jump(ret_from_intr);
- }
-
- static int setup_compat_l4(struct vcpu *v)
---- xen/arch/x86/setup.c.orig 2020-05-18 18:53:09.000000000 +0200
-+++ xen/arch/x86/setup.c 2020-11-10 17:51:10.898525723 +0100
-@@ -631,7 +631,7 @@ static void __init noreturn reinit_bsp_s
- stack_base[0] = stack;
- memguard_guard_stack(stack);
-
-- reset_stack_and_jump_nolp(init_done);
-+ reset_stack_and_jump(init_done);
- }
-
- /*
---- xen/common/livepatch.c.orig 2020-05-18 18:53:09.000000000 +0200
-+++ xen/common/livepatch.c 2020-11-10 17:51:10.898525723 +0100
-@@ -1300,6 +1300,11 @@ void check_for_livepatch_work(void)
- s_time_t timeout;
- unsigned long flags;
-
-+ /* Only do any work when invoked in truly idle state. */
-+ if ( system_state != SYS_STATE_active ||
-+ !is_idle_domain(current->sched_unit->domain) )
-+ return;
-+
- /* Fast path: no work to do. */
- if ( !per_cpu(work_to_do, cpu ) )
- return;
---- xen/include/asm-x86/current.h.orig 2019-12-18 16:18:59.000000000 +0100
-+++ xen/include/asm-x86/current.h 2020-11-10 17:51:10.902525725 +0100
-@@ -129,22 +129,16 @@ unsigned long get_stack_dump_bottom (uns
- # define CHECK_FOR_LIVEPATCH_WORK ""
- #endif
-
--#define switch_stack_and_jump(fn, instr) \
-+#define reset_stack_and_jump(fn) \
- ({ \
- __asm__ __volatile__ ( \
- "mov %0,%%"__OP"sp;" \
-- instr \
-+ CHECK_FOR_LIVEPATCH_WORK \
- "jmp %c1" \
- : : "r" (guest_cpu_user_regs()), "i" (fn) : "memory" ); \
- unreachable(); \
- })
-
--#define reset_stack_and_jump(fn) \
-- switch_stack_and_jump(fn, CHECK_FOR_LIVEPATCH_WORK)
--
--#define reset_stack_and_jump_nolp(fn) \
-- switch_stack_and_jump(fn, "")
--
- /*
- * Which VCPU's state is currently running on each CPU?
- * This is not necesasrily the same as 'current' as a CPU may be
-From: Jan Beulich <jbeulich%suse.com@localhost>
-Subject: x86: fold guest_idle_loop() into idle_loop()
-
-The latter can easily be made cover both cases. This is in preparation
-of using idle_loop directly for populating idle_csw.tail.
-
-Take the liberty and also adjust indentation / spacing in involved code.
-
-Signed-off-by: Jan Beulich <jbeulich%suse.com@localhost>
-Reviewed-by: Juergen Gross <jgross%suse.com@localhost>
-
---- xen/arch/x86/domain.c.orig 2020-11-10 17:51:10.894525721 +0100
-+++ xen/arch/x86/domain.c 2020-11-10 17:51:46.354546349 +0100
-@@ -133,14 +133,22 @@ void play_dead(void)
- static void idle_loop(void)
- {
- unsigned int cpu = smp_processor_id();
-+ /*
-+ * Idle vcpus might be attached to non-idle units! We don't do any
-+ * standard idle work like tasklets or livepatching in this case.
-+ */
-+ bool guest = !is_idle_domain(current->sched_unit->domain);
-
- for ( ; ; )
- {
- if ( cpu_is_offline(cpu) )
-+ {
-+ ASSERT(!guest);
- play_dead();
-+ }
-
- /* Are we here for running vcpu context tasklets, or for idling? */
-- if ( unlikely(tasklet_work_to_do(cpu)) )
-+ if ( !guest && unlikely(tasklet_work_to_do(cpu)) )
- {
- do_tasklet();
- /* Livepatch work is always kicked off via a tasklet. */
-@@ -151,28 +159,14 @@ static void idle_loop(void)
- * and then, after it is done, whether softirqs became pending
- * while we were scrubbing.
- */
-- else if ( !softirq_pending(cpu) && !scrub_free_pages() &&
-- !softirq_pending(cpu) )
-- pm_idle();
-- do_softirq();
-- }
--}
--
--/*
-- * Idle loop for siblings in active schedule units.
-- * We don't do any standard idle work like tasklets or livepatching.
-- */
--static void guest_idle_loop(void)
--{
-- unsigned int cpu = smp_processor_id();
--
-- for ( ; ; )
-- {
-- ASSERT(!cpu_is_offline(cpu));
--
-- if ( !softirq_pending(cpu) && !scrub_free_pages() &&
-- !softirq_pending(cpu))
-- sched_guest_idle(pm_idle, cpu);
-+ else if ( !softirq_pending(cpu) && !scrub_free_pages() &&
-+ !softirq_pending(cpu) )
-+ {
-+ if ( guest )
-+ sched_guest_idle(pm_idle, cpu);
-+ else
-+ pm_idle();
-+ }
- do_softirq();
- }
- }
-@@ -190,10 +184,6 @@ void startup_cpu_idle_loop(void)
-
- static void noreturn continue_idle_domain(struct vcpu *v)
- {
-- /* Idle vcpus might be attached to non-idle units! */
-- if ( !is_idle_domain(v->sched_unit->domain) )
-- reset_stack_and_jump(guest_idle_loop);
--
- reset_stack_and_jump(idle_loop);
- }
-
-From: Jan Beulich <jbeulich%suse.com@localhost>
-Subject: x86: avoid calling {svm,vmx}_do_resume()
-
-These functions follow the following path: hvm_do_resume() ->
-handle_hvm_io_completion() -> hvm_wait_for_io() ->
-wait_on_xen_event_channel() -> do_softirq() -> schedule() ->
-sched_context_switch() -> continue_running() and hence may
-recursively invoke themselves. If this ends up happening a couple of
-times, a stack overflow would result.
-
-Prevent this by also resetting the stack at the
-->arch.ctxt_switch->tail() invocations (in both places for consistency)
-and thus jumping to the functions instead of calling them.
-
-This is XSA-348 / CVE-2020-29566.
-
-Reported-by: Julien Grall <jgrall%amazon.com@localhost>
-Signed-off-by: Jan Beulich <jbeulich%suse.com@localhost>
-Reviewed-by: Juergen Gross <jgross%suse.com@localhost>
-
---- xen/arch/x86/domain.c.orig 2020-11-10 17:51:46.354546349 +0100
-+++ xen/arch/x86/domain.c 2020-11-10 17:56:58.758730088 +0100
-@@ -130,7 +130,7 @@ void play_dead(void)
- dead_idle();
- }
-
--static void idle_loop(void)
-+static void noreturn idle_loop(void)
- {
- unsigned int cpu = smp_processor_id();
- /*
-@@ -182,11 +182,6 @@ void startup_cpu_idle_loop(void)
- reset_stack_and_jump(idle_loop);
- }
-
--static void noreturn continue_idle_domain(struct vcpu *v)
--{
-- reset_stack_and_jump(idle_loop);
--}
--
- void init_hypercall_page(struct domain *d, void *ptr)
- {
- memset(ptr, 0xcc, PAGE_SIZE);
-@@ -535,7 +530,7 @@ int arch_domain_create(struct domain *d,
- static const struct arch_csw idle_csw = {
- .from = paravirt_ctxt_switch_from,
- .to = paravirt_ctxt_switch_to,
-- .tail = continue_idle_domain,
-+ .tail = idle_loop,
- };
-
- d->arch.ctxt_switch = &idle_csw;
-@@ -1833,20 +1828,12 @@ void context_switch(struct vcpu *prev, s
- /* Ensure that the vcpu has an up-to-date time base. */
- update_vcpu_system_time(next);
-
-- /*
-- * Schedule tail *should* be a terminal function pointer, but leave a
-- * bug frame around just in case it returns, to save going back into the
-- * context switching code and leaving a far more subtle crash to diagnose.
-- */
-- nextd->arch.ctxt_switch->tail(next);
Home |
Main Index |
Thread Index |
Old Index