[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v3 5/5] block: Prevent /dev/fd/X filename from b

From: Corey Bryant
Subject: Re: [Qemu-devel] [PATCH v3 5/5] block: Prevent /dev/fd/X filename from being detected as floppy
Date: Fri, 15 Jun 2012 11:12:11 -0400
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120605 Thunderbird/13.0

On 06/15/2012 10:38 AM, Luiz Capitulino wrote:
On Thu, 14 Jun 2012 11:55:05 -0400
Corey Bryant <address@hidden> wrote:

Reported-by: Kevin Wolf <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Corey Bryant <address@hidden>

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.

Yes, this one makes even more sense to move earlier in the series.  Thanks.

  -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) {


reply via email to

[Prev in Thread] Current Thread [Next in Thread]