diff options
| author | drochner <drochner@pkgsrc.org> | 2013-01-20 15:21:54 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2013-01-20 15:21:54 +0000 |
| commit | be2d40292d514094546708b07aa4c4051927e0ab (patch) | |
| tree | 9f8e51ec394772acd0cfe2f7a8ea5a46ff5445a5 /sysutils/xenkernel41 | |
| parent | 887ee5aeaa9292e7540b3a84589e974d54e3b32b (diff) | |
| download | pkgsrc-be2d40292d514094546708b07aa4c4051927e0ab.tar.gz | |
oops, a patch was in the wrong sub-pkg
bump PKGREV
Diffstat (limited to 'sysutils/xenkernel41')
| -rw-r--r-- | sysutils/xenkernel41/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xenkernel41/patches/patch-CVE-2012-6075 | 34 |
2 files changed, 1 insertions, 36 deletions
diff --git a/sysutils/xenkernel41/distinfo b/sysutils/xenkernel41/distinfo index e006cf472a9..7a40065969a 100644 --- a/sysutils/xenkernel41/distinfo +++ b/sysutils/xenkernel41/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.13 2013/01/17 19:37:54 drochner Exp $ +$NetBSD: distinfo,v 1.14 2013/01/20 15:21:54 drochner Exp $ SHA1 (xen-4.1.4.tar.gz) = d5f1e9c9eeb96202dd827c196750530ffc64baab RMD160 (xen-4.1.4.tar.gz) = e3cb379954c985354dfd7dfbed15eae43e73254d Size (xen-4.1.4.tar.gz) = 10387283 bytes SHA1 (patch-CVE-2012-5511_2) = a345d28d4a6dcc4bf203243f49d66b5479fdbf14 SHA1 (patch-CVE-2012-5634) = 2992ee4972ec733a80fa3841d12a70a9076625c0 -SHA1 (patch-CVE-2012-6075) = e368374468526a6ceee03fe15a5ee35aca28cc6e SHA1 (patch-xen_drivers_char_console_c) = 0fe186369602ccffaeec6f4bfbee8bb4298d3ff0 SHA1 (patch-xen_include_xen_stdarg.h) = e9df974a9b783ed442ab17497198432cb9844b70 diff --git a/sysutils/xenkernel41/patches/patch-CVE-2012-6075 b/sysutils/xenkernel41/patches/patch-CVE-2012-6075 deleted file mode 100644 index e45763e5330..00000000000 --- a/sysutils/xenkernel41/patches/patch-CVE-2012-6075 +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-CVE-2012-6075,v 1.1 2013/01/17 19:37:55 drochner Exp $ - -see http://lists.xen.org/archives/html/xen-devel/2013-01/msg01070.html - ---- tools/ioemu-qemu-xen/hw/e1000.c.orig 2012-11-13 18:25:17.000000000 +0000 -+++ tools/ioemu-qemu-xen/hw/e1000.c -@@ -55,6 +55,11 @@ static int debugflags = DBGBIT(TXERR) | - #define REG_IOADDR 0x0 - #define REG_IODATA 0x4 - -+/* this is the size past which hardware will drop packets when setting LPE=0 */ -+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522 -+/* this is the size past which hardware will drop packets when setting LPE=1 */ -+#define MAXIMUM_ETHERNET_LPE_SIZE 16384 -+ - /* - * HW models: - * E1000_DEV_ID_82540EM works with Windows and Linux -@@ -628,6 +633,15 @@ e1000_receive(void *opaque, const uint8_ - return; - } - -+ /* Discard oversized packets if !LPE and !SBP. */ -+ if ((size > MAXIMUM_ETHERNET_LPE_SIZE || -+ (size > MAXIMUM_ETHERNET_VLAN_SIZE -+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE))) -+ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { -+ DBGOUT(RX, "packet too large for applicable LPE/VLAN size\n"); -+ return; -+ } -+ - if (!receive_filter(s, buf, size)) - return; - |