lkml.org 
[lkml]   [2011]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: missing compat-ioctl for CDROM_DRIVE_STATUS + FDGETPRM
    On Wed, Jun 29, 2011 at 02:51:17PM +0200, Johannes Stezenbach wrote:
    > On Wed, Jun 29, 2011 at 02:30:42PM +0200, Arnd Bergmann wrote:
    > > On Wednesday 29 June 2011, Johannes Stezenbach wrote:
    > > > Do I get it right that just adding two IGNORE_IOCTL() to
    > > > the ioctl_pointer array in linux/fs/compat_ioctl.c is sufficient,
    > > > like in commit 3f001711?
    > >
    > > Yes.

    Hm, it only works for CDROM_DRIVE_STATUS, but I still get
    the warning for FDGETPRM (801c0204). Could you give
    me a hint how to address this?

    (tested with both 2.6.39.2 and 3.0-rc5-63-g0d72c6f)

    diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
    index 61abb63..ae24aba 100644
    --- a/fs/compat_ioctl.c
    +++ b/fs/compat_ioctl.c
    @@ -68,6 +68,8 @@

    #ifdef CONFIG_BLOCK
    #include <linux/loop.h>
    +#include <linux/cdrom.h>
    +#include <linux/fd.h>
    #include <scsi/scsi.h>
    #include <scsi/scsi_ioctl.h>
    #include <scsi/sg.h>
    @@ -944,6 +946,9 @@ COMPATIBLE_IOCTL(FIOQSIZE)
    IGNORE_IOCTL(LOOP_CLR_FD)
    /* md calls this on random blockdevs */
    IGNORE_IOCTL(RAID_VERSION)
    +/* qemu/qemu-img might calls these two on plain files for probing */
    +IGNORE_IOCTL(CDROM_DRIVE_STATUS)
    +IGNORE_IOCTL(FDGETPRM)
    /* SG stuff */
    COMPATIBLE_IOCTL(SG_SET_TIMEOUT)
    COMPATIBLE_IOCTL(SG_GET_TIMEOUT)

    Thanks,
    Johannes


    \
     
     \ /
      Last update: 2011-06-29 17:11    [W:0.070 / U:1.976 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site