From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfXf2-0008C2-H9 for qemu-devel@nongnu.org; Fri, 15 Jun 2012 10:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfXf0-0004x9-62 for qemu-devel@nongnu.org; Fri, 15 Jun 2012 10:38:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19049) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfXez-0004wf-Tw for qemu-devel@nongnu.org; Fri, 15 Jun 2012 10:38:02 -0400 Date: Fri, 15 Jun 2012 11:38:11 -0300 From: Luiz Capitulino Message-ID: <20120615113811.225a5ed6@doriath.home> In-Reply-To: <1339689305-27031-6-git-send-email-coreyb@linux.vnet.ibm.com> References: <1339689305-27031-1-git-send-email-coreyb@linux.vnet.ibm.com> <1339689305-27031-6-git-send-email-coreyb@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 5/5] block: Prevent /dev/fd/X filename from being detected as floppy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Corey Bryant Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, libvir-list@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com, eblake@redhat.com On Thu, 14 Jun 2012 11:55:05 -0400 Corey Bryant wrote: > Reported-by: Kevin Wolf > Reviewed-by: Paolo Bonzini > Signed-off-by: Corey Bryant This too, would be better to move before the /dev/fd/X feature so that we avoid having introducing a bug and fixing it in a later commit. But again, it's not a huge issue. > --- > v3: > -This patch is new in v3. It was previously submitted on its > own, and is now being included in this series. > > block/raw-posix.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/block/raw-posix.c b/block/raw-posix.c > index d8eff2f..68886cd 100644 > --- a/block/raw-posix.c > +++ b/block/raw-posix.c > @@ -946,9 +946,11 @@ static int floppy_probe_device(const char *filename) > int prio = 0; > struct floppy_struct fdparam; > struct stat st; > + const char *p; > > - if (strstart(filename, "/dev/fd", NULL)) > + if (strstart(filename, "/dev/fd", &p) && p[0] != '/') { > prio = 50; > + } > > fd = qemu_open(filename, O_RDONLY | O_NONBLOCK); > if (fd < 0) {