diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /net/atm | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/mpoa_proc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index 1c79056bb..bc04ecc67 100644 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c @@ -155,7 +155,10 @@ static ssize_t proc_mpc_read(struct file *file, char *buff, if (*pos >= length) length = 0; else { if ((count + *pos) > length) count = length - *pos; - copy_to_user(buff, (char *)page , count); + if (copy_to_user(buff, (char *)page , count)) { + free_page(page); + return -EFAULT; + } *pos += count; } @@ -198,7 +201,7 @@ static ssize_t proc_mpc_write(struct file *file, const char *buff, *ppos += incoming; page[incoming] = '\0'; - retval = parse_qos(buff, incoming); + retval = parse_qos(page, incoming); if (retval == 0) printk("mpoa: proc_mpc_write: could not parse '%s'\n", page); |