diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
| commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
| tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /net | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'net')
| -rw-r--r-- | net/atm/mpc.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ip_options.c | 6 | ||||
| -rw-r--r-- | net/packet/af_packet.c | 2 | ||||
| -rw-r--r-- | net/socket.c | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 68cd8a034..cb6179483 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c @@ -166,7 +166,7 @@ struct atm_mpoa_qos *atm_mpoa_add_qos(uint32_t dst_ip, struct atm_qos *qos) return entry; } - entry = kmalloc(sizeof(struct atm_qos), GFP_KERNEL); + entry = kmalloc(sizeof(struct atm_mpoa_qos), GFP_KERNEL); if (entry == NULL) { printk("mpoa: atm_mpoa_add_qos: out of memory\n"); return entry; diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 53e664444..b511e29fd 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -5,7 +5,7 @@ * * The options processing module for ip.c * - * Version: $Id: ip_options.c,v 1.19 2000/07/26 01:04:17 davem Exp $ + * Version: $Id: ip_options.c,v 1.20 2000/08/09 09:17:00 davem Exp $ * * Authors: A.N.Kuznetsov * @@ -498,8 +498,10 @@ int ip_options_get(struct ip_options **optp, unsigned char *data, int optlen, in memset(opt, 0, sizeof(struct ip_options)); if (optlen) { if (user) { - if (copy_from_user(opt->__data, data, optlen)) + if (copy_from_user(opt->__data, data, optlen)) { + kfree(opt); return -EFAULT; + } } else memcpy(opt->__data, data, optlen); } diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index bf557e253..7a484606b 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -5,7 +5,7 @@ * * PACKET - implements raw packet sockets. * - * Version: $Id: af_packet.c,v 1.37 2000/07/26 01:04:21 davem Exp $ + * Version: $Id: af_packet.c,v 1.39 2000/08/09 08:04:45 davem Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> diff --git a/net/socket.c b/net/socket.c index 2993991dd..f0565ed3e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1372,7 +1372,6 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr *msg, unsigned flags) { if (ctl_len > sizeof(ctl)) { - err = -ENOBUFS; ctl_buf = sock_kmalloc(sock->sk, ctl_len, GFP_KERNEL); if (ctl_buf == NULL) goto out_freeiov; |