1 files changed, 30 insertions, 28 deletions

diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c
index 1316456e2a28..e9809356c530 100644
--- a/arch/um/drivers/pcap_user.c
+++ b/arch/um/drivers/pcap_user.c
@@ -1,21 +1,17 @@
 /*
- * Copyright (C) 2002 Jeff Dike <jdike@karaya.com>
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL.
  */
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <pcap.h>
+#include <string.h>
 #include <asm/types.h>
 #include "net_user.h"
 #include "pcap_user.h"
-#include "user.h"
-#include "um_malloc.h"
 #include "kern_constants.h"
-
-#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
+#include "um_malloc.h"
+#include "user.h"
 
 #define PCAP_FD(p) (*(int *)(p))
 
@@ -25,8 +21,9 @@ static int pcap_user_init(void *data, void *dev)
         pcap_t *p;
         char errors[PCAP_ERRBUF_SIZE];
 
-        p = pcap_open_live(pri->host_if, MAX_PACKET, pri->promisc, 0, errors);
-        if(p == NULL){
+        p = pcap_open_live(pri->host_if, ETH_MAX_PACKET + ETH_HEADER_OTHER,
+                           pri->promisc, 0, errors);
+        if (p == NULL) {
                 printk(UM_KERN_ERR "pcap_user_init : pcap_open_live failed - "
                        "'%s'\n", errors);
                 return -EINVAL;
@@ -43,50 +40,55 @@ static int pcap_open(void *data)
         __u32 netmask;
         int err;
 
-        if(pri->pcap == NULL)
+        if (pri->pcap == NULL)
                 return -ENODEV;
 
-        if(pri->filter != NULL){
+        if (pri->filter != NULL) {
                 err = dev_netmask(pri->dev, &netmask);
-                if(err < 0){
+                if (err < 0) {
                         printk(UM_KERN_ERR "pcap_open : dev_netmask failed\n");
                         return -EIO;
                 }
 
-                pri->compiled = kmalloc(sizeof(struct bpf_program), UM_GFP_KERNEL);
-                if(pri->compiled == NULL){
+                pri->compiled = kmalloc(sizeof(struct bpf_program),
+                                        UM_GFP_KERNEL);
+                if (pri->compiled == NULL) {
                         printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");
                         return -ENOMEM;
                 }
 
-                err = pcap_compile(pri->pcap, 
-                                   (struct bpf_program *) pri->compiled, 
+                err = pcap_compile(pri->pcap,
+                                   (struct bpf_program *) pri->compiled,
                                    pri->filter, pri->optimize, netmask);
-                if(err < 0){
+                if (err < 0) {
                         printk(UM_KERN_ERR "pcap_open : pcap_compile failed - "
                                "'%s'\n", pcap_geterr(pri->pcap));
-                        return -EIO;
+                        goto out;
                 }
 
                 err = pcap_setfilter(pri->pcap, pri->compiled);
-                if(err < 0){
+                if (err < 0) {
                         printk(UM_KERN_ERR "pcap_open : pcap_setfilter "
                                "failed - '%s'\n", pcap_geterr(pri->pcap));
-                        return -EIO;
+                        goto out;
                 }
         }
 
         return PCAP_FD(pri->pcap);
+
+ out:
+        kfree(pri->compiled);
+        return -EIO;
 }
 
 static void pcap_remove(void *data)
 {
         struct pcap_data *pri = data;
 
-        if(pri->compiled != NULL)
+        if (pri->compiled != NULL)
                 pcap_freecode(pri->compiled);
 
-        if(pri->pcap != NULL)
+        if (pri->pcap != NULL)
                 pcap_close(pri->pcap);
 }
 
@@ -95,7 +97,7 @@ struct pcap_handler_data {
         int len;
 };
 
-static void handler(u_char *data, const struct pcap_pkthdr *header, 
+static void handler(u_char *data, const struct pcap_pkthdr *header,
                     const u_char *packet)
 {
         int len;
@@ -115,12 +117,12 @@ int pcap_user_read(int fd, void *buffer, int len, struct pcap_data *pri)
         int n;
 
         n = pcap_dispatch(pri->pcap, 1, handler, (u_char *) &hdata);
-        if(n < 0){
+        if (n < 0) {
                 printk(UM_KERN_ERR "pcap_dispatch failed - %s\n",
                        pcap_geterr(pri->pcap));
                 return -EIO;
         }
-        else if(n == 0) 
+        else if (n == 0)
                 return 0;
         return hdata.len;
 }
@@ -130,8 +132,8 @@ const struct net_user_info pcap_user_info = {
         .open           = pcap_open,
         .close          = NULL,
         .remove         = pcap_remove,
-        .set_mtu        = NULL,
         .add_address    = NULL,
         .delete_address = NULL,
-        .max_packet     = MAX_PACKET - ETH_HEADER_OTHER
+        .mtu            = ETH_MAX_PACKET,
+        .max_packet     = ETH_MAX_PACKET + ETH_HEADER_OTHER,
 };