From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeoaV-0002Mo-9K for qemu-devel@nongnu.org; Wed, 13 Jun 2012 10:30:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SeoaP-0008UE-9S for qemu-devel@nongnu.org; Wed, 13 Jun 2012 10:30:22 -0400 Received: from cpe-174-097-227-101.nc.res.rr.com ([174.97.227.101]:51676 helo=localhost.localdomain) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeoaP-0008U1-3c for qemu-devel@nongnu.org; Wed, 13 Jun 2012 10:30:17 -0400 From: root Date: Wed, 13 Jun 2012 10:30:59 -0400 Message-Id: <1339597859-7755-1-git-send-email-root@localhost.localdomain> Subject: [Qemu-devel] [PATCH] block: Prevent /dev/fd/X filename from being detected as floppy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, Corey Bryant From: Corey Bryant Reported-by: Kevin Wolf Signed-off-by: Corey Bryant --- 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) { -- 1.7.10.2