mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
f34d9d2dcb
This fixes a number of problems associated with network interface hotplug. The userspace initialization function can fail in some cases, but the failure was never passed back to eth_configure, which proceeded with the configuration. This results in a zombie device that is present, but can't work. This is fixed by allowing the initialization routines to return an error, which is checked, and the configuration aborted on failure. eth_configure failed to check for many failures. Even when it did check, it didn't undo whatever initializations has already happened, so a present, but partially initialized and non-working device could result. It now checks everything that can fail, and bails out, undoing whatever had been done. The return value of eth_configure was always ignored, so it is now just void. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
135 lines
2.8 KiB
C
135 lines
2.8 KiB
C
/*
|
|
* Copyright (C) 2002 Jeff Dike <jdike@karaya.com>
|
|
* Licensed under the GPL.
|
|
*/
|
|
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <pcap.h>
|
|
#include <asm/types.h>
|
|
#include "net_user.h"
|
|
#include "pcap_user.h"
|
|
#include "user.h"
|
|
#include "um_malloc.h"
|
|
|
|
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
|
|
|
|
#define PCAP_FD(p) (*(int *)(p))
|
|
|
|
static int pcap_user_init(void *data, void *dev)
|
|
{
|
|
struct pcap_data *pri = data;
|
|
pcap_t *p;
|
|
char errors[PCAP_ERRBUF_SIZE];
|
|
|
|
p = pcap_open_live(pri->host_if, MAX_PACKET, pri->promisc, 0, errors);
|
|
if(p == NULL){
|
|
printk("pcap_user_init : pcap_open_live failed - '%s'\n",
|
|
errors);
|
|
return -EINVAL;
|
|
}
|
|
|
|
pri->dev = dev;
|
|
pri->pcap = p;
|
|
return 0;
|
|
}
|
|
|
|
static int pcap_open(void *data)
|
|
{
|
|
struct pcap_data *pri = data;
|
|
__u32 netmask;
|
|
int err;
|
|
|
|
if(pri->pcap == NULL)
|
|
return -ENODEV;
|
|
|
|
if(pri->filter != NULL){
|
|
err = dev_netmask(pri->dev, &netmask);
|
|
if(err < 0){
|
|
printk("pcap_open : dev_netmask failed\n");
|
|
return -EIO;
|
|
}
|
|
|
|
pri->compiled = um_kmalloc(sizeof(struct bpf_program));
|
|
if(pri->compiled == NULL){
|
|
printk("pcap_open : kmalloc failed\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
err = pcap_compile(pri->pcap,
|
|
(struct bpf_program *) pri->compiled,
|
|
pri->filter, pri->optimize, netmask);
|
|
if(err < 0){
|
|
printk("pcap_open : pcap_compile failed - '%s'\n",
|
|
pcap_geterr(pri->pcap));
|
|
return -EIO;
|
|
}
|
|
|
|
err = pcap_setfilter(pri->pcap, pri->compiled);
|
|
if(err < 0){
|
|
printk("pcap_open : pcap_setfilter failed - '%s'\n",
|
|
pcap_geterr(pri->pcap));
|
|
return -EIO;
|
|
}
|
|
}
|
|
|
|
return PCAP_FD(pri->pcap);
|
|
}
|
|
|
|
static void pcap_remove(void *data)
|
|
{
|
|
struct pcap_data *pri = data;
|
|
|
|
if(pri->compiled != NULL)
|
|
pcap_freecode(pri->compiled);
|
|
|
|
pcap_close(pri->pcap);
|
|
}
|
|
|
|
struct pcap_handler_data {
|
|
char *buffer;
|
|
int len;
|
|
};
|
|
|
|
static void handler(u_char *data, const struct pcap_pkthdr *header,
|
|
const u_char *packet)
|
|
{
|
|
int len;
|
|
|
|
struct pcap_handler_data *hdata = (struct pcap_handler_data *) data;
|
|
|
|
len = hdata->len < header->caplen ? hdata->len : header->caplen;
|
|
memcpy(hdata->buffer, packet, len);
|
|
hdata->len = len;
|
|
}
|
|
|
|
int pcap_user_read(int fd, void *buffer, int len, struct pcap_data *pri)
|
|
{
|
|
struct pcap_handler_data hdata = ((struct pcap_handler_data)
|
|
{ .buffer = buffer,
|
|
.len = len });
|
|
int n;
|
|
|
|
n = pcap_dispatch(pri->pcap, 1, handler, (u_char *) &hdata);
|
|
if(n < 0){
|
|
printk("pcap_dispatch failed - %s\n", pcap_geterr(pri->pcap));
|
|
return -EIO;
|
|
}
|
|
else if(n == 0)
|
|
return 0;
|
|
return hdata.len;
|
|
}
|
|
|
|
const struct net_user_info pcap_user_info = {
|
|
.init = pcap_user_init,
|
|
.open = pcap_open,
|
|
.close = NULL,
|
|
.remove = pcap_remove,
|
|
.set_mtu = NULL,
|
|
.add_address = NULL,
|
|
.delete_address = NULL,
|
|
.max_packet = MAX_PACKET - ETH_HEADER_OTHER
|
|
};
|