[libvirt] [PATCH v4 5/7] block: Prevent /dev/fd/X filename from being detected as floppy

Reported-by: Kevin Wolf <kwolf(a)redhat.com&gt; Reviewed-by: Paolo Bonzini <pbonzini(a)redhat.com&gt; Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com&gt; --- v3: -This patch is new in v3. It was previously submitted on its own, and is now being included in this series. v4 -Moved patch to be earlier in series (lcapitulino(a)redhat.com) 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 03fcfcc..0d9be0b 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 = open(filename, O_RDONLY | O_NONBLOCK); if (fd < 0) { -- 1.7.10.2