Update of /cvsroot/linuxconsole/ruby/ruby-2.6/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7020/ruby-2.6/fs
Modified Files:
compat_ioctl.c
Log Message:
sync to 2.6.3
Index: compat_ioctl.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/fs/compat_ioctl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- compat_ioctl.c 9 Feb 2004 07:31:07 -0000 1.6
+++ compat_ioctl.c 20 Feb 2004 06:52:18 -0000 1.7
@@ -2116,6 +2116,7 @@
case FDDEFPRM32:
case FDGETPRM32:
{
+ compat_uptr_t name;
struct floppy_struct32 *uf;
struct floppy_struct *f;
@@ -2134,7 +2135,8 @@
err |= __get_user(f->rate, &uf->rate);
err |= __get_user(f->spec1, &uf->spec1);
err |= __get_user(f->fmt_gap, &uf->fmt_gap);
- err |= __get_user((u64)f->name, &uf->name);
+ err |= __get_user(name, &uf->name);
+ f->name = compat_ptr(name);
if (err) {
err = -EFAULT;
goto out;
|
