fcf436606c
do a patch refresh in xentools42 rather than split the patches for pass-through.c over 5 files, delete xentools42/patches/patch-CVE-2015-2756 and assemble all in xentools42/patches/patch-qemu-xen-traditional_hw_pass-through.c
34 lines
1.3 KiB
C
34 lines
1.3 KiB
C
$NetBSD: patch-qemu-xen-traditional_hw_e1000.c,v 1.2 2015/08/23 16:17:12 spz Exp $
|
|
|
|
From sysutils/xentools33/patches/patch-ak.
|
|
|
|
qemu-0.13.x will include this fix:
|
|
http://git.qemu.org/qemu.git/commit/?id=9651ac55e5de0e1534d898316cc851af6ffc4334
|
|
|
|
--- qemu-xen-traditional/hw/e1000.c.orig 2014-01-09 12:44:42.000000000 +0000
|
|
+++ qemu-xen-traditional/hw/e1000.c
|
|
@@ -265,16 +265,20 @@ set_eecd(E1000State *s, int index, uint3
|
|
|
|
s->eecd_state.old_eecd = val & (E1000_EECD_SK | E1000_EECD_CS |
|
|
E1000_EECD_DI|E1000_EECD_FWE_MASK|E1000_EECD_REQ);
|
|
+ if (!(E1000_EECD_CS & val)) // CS inactive; nothing to do
|
|
+ return;
|
|
+ if (E1000_EECD_CS & (val ^ oldval)) { // CS rise edge; reset state
|
|
+ s->eecd_state.val_in = 0;
|
|
+ s->eecd_state.bitnum_in = 0;
|
|
+ s->eecd_state.bitnum_out = 0;
|
|
+ s->eecd_state.reading = 0;
|
|
+ }
|
|
if (!(E1000_EECD_SK & (val ^ oldval))) // no clock edge
|
|
return;
|
|
if (!(E1000_EECD_SK & val)) { // falling edge
|
|
s->eecd_state.bitnum_out++;
|
|
return;
|
|
}
|
|
- if (!(val & E1000_EECD_CS)) { // rising, no CS (EEPROM reset)
|
|
- memset(&s->eecd_state, 0, sizeof s->eecd_state);
|
|
- return;
|
|
- }
|
|
s->eecd_state.val_in <<= 1;
|
|
if (val & E1000_EECD_DI)
|
|
s->eecd_state.val_in |= 1;
|