From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Stezenbach <js@sig21.net>
Subject: Re: missing compat-ioctl for CDROM_DRIVE_STATUS + FDGETPRM
Date: Wed, 29 Jun 2011 17:09:07 +0200
Message-ID: <20110629150907.GA3412@sig21.net>
References: <20110617090424.GA19345@sig21.net>
 <201106171502.39445.arnd@arndb.de>
 <20110629113834.GA4227@sig21.net>
 <201106291430.43102.arnd@arndb.de>
 <20110629125117.GA5739@sig21.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
To: Arnd Bergmann <arnd@arndb.de>
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20110629125117.GA5739@sig21.net>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

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