diff options
| author | kaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk> | 2003-02-16 21:01:20 +0000 |
|---|---|---|
| committer | kaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk> | 2003-02-16 21:01:20 +0000 |
| commit | 88ce71edec65a83770c61e1a9143297ac03f3dad (patch) | |
| tree | 1a8aebceb9c9cebda3b5ea79c23bb1f90a9bb5cb | |
| parent | daaedbfc54aa9480c629ce9c688d752b8d1017ec (diff) | |
| download | xen-88ce71edec65a83770c61e1a9143297ac03f3dad.tar.gz xen-88ce71edec65a83770c61e1a9143297ac03f3dad.tar.bz2 xen-88ce71edec65a83770c61e1a9143297ac03f3dad.zip | |
bitkeeper revision 1.60 (3e4ffc20MbjIucCcaw9sFYEAAu-yeA)
Cleanups. Fixed domain building some more.
| -rw-r--r-- | xen-2.4.16/arch/i386/traps.c | 6 | ||||
| -rw-r--r-- | xen-2.4.16/common/domain.c | 2 | ||||
| -rw-r--r-- | xen-2.4.16/common/network.c | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/xen-2.4.16/arch/i386/traps.c b/xen-2.4.16/arch/i386/traps.c index 1505907b19..f7d18610a0 100644 --- a/xen-2.4.16/arch/i386/traps.c +++ b/xen-2.4.16/arch/i386/traps.c @@ -297,12 +297,6 @@ asmlinkage void do_general_protection(struct pt_regs * regs, long error_code) ti = current->thread.traps + (error_code>>3); if ( ti->dpl >= (regs->xcs & 3) ) { - /* XXX Kill next conditional soon :-) XXX */ - if ( (error_code>>3)==0x80 ) - { - printk("DIDN'T USE FAST-TRAP HANDLER FOR 0x80!!! :-(\n"); - BUG(); - } gtb->flags = GTBF_TRAP_NOCODE; gtb->cs = ti->cs; gtb->eip = ti->address; diff --git a/xen-2.4.16/common/domain.c b/xen-2.4.16/common/domain.c index 311f7cc219..428927a28d 100644 --- a/xen-2.4.16/common/domain.c +++ b/xen-2.4.16/common/domain.c @@ -321,7 +321,7 @@ int final_setup_guestos(struct task_struct * p, dom_meminfo_t * meminfo) __asm__ __volatile__ ( "mov %%eax,%%cr3" : : "a" (pagetable_val(p->mm.pagetable))); - memset(virt_startinfo_addr, 0, sizeof(virt_startinfo_addr)); + memset(virt_startinfo_addr, 0, sizeof(*virt_startinfo_addr)); virt_startinfo_addr->nr_pages = p->tot_pages; virt_startinfo_addr->shared_info = (shared_info_t *)meminfo->virt_shinfo_addr; virt_startinfo_addr->pt_base = meminfo->virt_load_addr + diff --git a/xen-2.4.16/common/network.c b/xen-2.4.16/common/network.c index 687d3e2403..608ca57037 100644 --- a/xen-2.4.16/common/network.c +++ b/xen-2.4.16/common/network.c @@ -347,20 +347,20 @@ int __net_get_target_vif(u8 *data, unsigned int len, int src_vif) int target = VIF_DROP; u8 *h_raw, *nh_raw; - if ( len < 2 ) goto drop; + if ( len < ETH_HLEN ) goto drop; nh_raw = data + ETH_HLEN; switch ( ntohs(*(unsigned short *)(data + 12)) ) { case ETH_P_ARP: - if ( len < 28 ) goto drop; + if ( len < (ETH_HLEN + 28) ) goto drop; target = net_find_rule((u8)ETH_P_ARP, 0, ntohl(*(u32 *)(nh_raw + 14)), ntohl(*(u32 *)(nh_raw + 24)), 0, 0, src_vif); break; case ETH_P_IP: - if ( len < 20 ) goto drop; + if ( len < (ETH_HLEN + 20) ) goto drop; h_raw = data + ((*(unsigned char *)(nh_raw)) & 0x0f) * 4; /* XXX For now, we ignore ports. */ |