diff options
Diffstat (limited to 'arch/um/drivers/net_user.c')
| -rw-r--r-- | arch/um/drivers/net_user.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c index abf2653f551..cd14157b556 100644 --- a/arch/um/drivers/net_user.c +++ b/arch/um/drivers/net_user.c @@ -11,11 +11,9 @@ #include <string.h> #include <sys/socket.h> #include <sys/wait.h> -#include "net_user.h" -#include "kern_constants.h" -#include "os.h" -#include "um_malloc.h" -#include "user.h" +#include <net_user.h> +#include <os.h> +#include <um_malloc.h> int tap_open_common(void *dev, char *gate_addr) { @@ -222,13 +220,16 @@ static void change(char *dev, char *what, unsigned char *addr, netmask[2], netmask[3]); output_len = UM_KERN_PAGE_SIZE; - output = kmalloc(output_len, UM_GFP_KERNEL); + output = uml_kmalloc(output_len, UM_GFP_KERNEL); if (output == NULL) printk(UM_KERN_ERR "change : failed to allocate output " "buffer\n"); pid = change_tramp(argv, output, output_len); - if (pid < 0) return; + if (pid < 0) { + kfree(output); + return; + } if (output != NULL) { printk("%s", output); |