lkml.org 
[lkml]   [2003]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] cpqarray.c fix stack usage
Hi!

This patch has been around for a while but didn't apply anymore.
Rewrite and resend.

Any reasons why this one hasn't been applied yet?

Jörn

--
Mundie uses a textbook tactic of manipulation: start with some
reasonable talk, and lead the audience to an unreasonable conclusion.
-- Bruce Perens

--- linux-2.5.70-bk12/drivers/block/cpqarray.c~stackfix_cpqarray 2003-06-05 17:47:17.000000000 +0200
+++ linux-2.5.70-bk12/drivers/block/cpqarray.c 2003-06-08 01:29:05.000000000 +0200
@@ -1028,7 +1028,7 @@
int diskinfo[4];
struct hd_geometry *geo = (struct hd_geometry *)arg;
ida_ioctl_t *io = (ida_ioctl_t*)arg;
- ida_ioctl_t my_io;
+ ida_ioctl_t *my_io;

switch(cmd) {
case HDIO_GETGEO:
@@ -1051,12 +1051,24 @@
return -EFAULT;
return 0;
case IDAPASSTHRU:
- if (!capable(CAP_SYS_RAWIO)) return -EPERM;
- if (copy_from_user(&my_io, io, sizeof(my_io)))
- return -EFAULT;
- error = ida_ctlr_ioctl(host, drv - host->drv, &my_io);
- if (error) return error;
- return copy_to_user(io, &my_io, sizeof(my_io)) ? -EFAULT : 0;
+ if (!capable(CAP_SYS_RAWIO))
+ return -EPERM;
+ my_io = kmalloc(sizeof(ida_ioctl_t), GFP_KERNEL);
+ if (!my_io)
+ return -ENOMEM;
+ error = -EFAULT;
+ if (copy_from_user(my_io, io, sizeof(*my_io)))
+ goto out_passthru;
+ error = ida_ctlr_ioctl(host, drv - host->drv, my_io);
+ if (error)
+ goto out_passthru;
+ error = -EFAULT;
+ if (copy_to_user(io, &my_io, sizeof(*my_io)))
+ goto out_passthru;
+ error = 0;
+out_passthru:
+ kfree(my_io);
+ return error;
case IDAGETCTLRSIG:
if (!arg) return -EINVAL;
put_user(host->ctlr_sig, (int*)arg);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:36    [W:0.257 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site