Skip to contentSkip to conversation

usb: dev-mtp: close fd in usb_mtp_object_readdir()

PATCH In review Li Qiang 4 participants 5 messages Jan 3, 2019 – Jan 11, 2019

lore
Share & tools
lore

Li Qiang

author
#0 lore raw

PATCH 1/1 usb: dev-mtp: close fd in usb_mtp_object_readdir()

Spotted by Coverity: CID 1397070

---
 hw/usb/dev-mtp.c | 2 ++
 1 file changed, 2 insertions(+)
hw/usb/dev-mtp.c +2 -0
index b19b576278..666bafd9e8 100644
@@ -666,6 +666,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
     }
     dir = fdopendir(fd);
     if (!dir) {
+        close(fd);
         return;
     }
 #ifdef CONFIG_INOTIFY1
@@ -682,6 +683,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
         usb_mtp_add_child(s, o, entry->d_name);
     }
     closedir(dir);
+    close(fd);
 }
 
 /* ----------------------------------------------------------------------- */
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · Li Qiang

Spotted by Coverity: CID 1397070

Closing a CVE to open a CID :)

Fixes bab9df35ce
Quoted 11 lines
---
 hw/usb/dev-mtp.c | 2 ++
 1 file changed, 2 insertions(+)
hw/usb/dev-mtp.c +0 -0
index b19b576278..666bafd9e8 100644

hw/usb/dev-mtp.c static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) · line 670

Quoted 5 lines
hw/usb/dev-mtp.c +1 -0
@@ -666,6 +666,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
     }
     dir = fdopendir(fd);
     if (!dir) {
+        close(fd);
         return;

This or:

           goto cleanup_fd;

hw/usb/dev-mtp.c static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) · line 685

Quoted 6 lines
hw/usb/dev-mtp.c +0 -0
     }
 #ifdef CONFIG_INOTIFY1
@@ -682,6 +683,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
         usb_mtp_add_child(s, o, entry->d_name);
     }
     closedir(dir);

And:

cleanup_fd:

hw/usb/dev-mtp.c static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) · line 689

Quoted 5 lines
hw/usb/dev-mtp.c +1 -0
+    close(fd);
 }
 
 /* ----------------------------------------------------------------------- */
#2 lore raw
In reply to Li Qiang

hw/usb/dev-mtp.c static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) · line 671

Quoted 13 lines · Li Qiang

Spotted by Coverity: CID 1397070

hw/usb/dev-mtp.c +1 -0
index b19b576278..666bafd9e8 100644
@@ -666,6 +666,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
     }
     dir = fdopendir(fd);
     if (!dir) {
+        close(fd);
         return;
     }

Ok, clearly a bug.

hw/usb/dev-mtp.c static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) · line 686

Quoted 6 lines
hw/usb/dev-mtp.c +1 -0
 #ifdef CONFIG_INOTIFY1
@@ -682,6 +683,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
         usb_mtp_add_child(s, o, entry->d_name);
     }
     closedir(dir);
+    close(fd);

Not fully sure this is correct.

The fdopendir manpage says the app should not use fd any more after successfully calling fdopendir(), and I assumed that includes calling close(). But I've seen the Coverity message warning this one too, so maybe I'm wrong ...

cheers,
Gerd

#3 lore raw
Quoted 13 lines · Gerd Hoffmann

hw/usb/dev-mtp.c static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) · line 686

Quoted 8 lines · Li Qiang

Spotted by Coverity: CID 1397070

#ifdef CONFIG_INOTIFY1

hw/usb/dev-mtp.c +1 -0
@@ -682,6 +683,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
         usb_mtp_add_child(s, o, entry->d_name);
     }
     closedir(dir);
+    close(fd);

Not fully sure this is correct.

Quoted 3 lines

The fdopendir manpage says the app should not use fd any more after successfully calling fdopendir(), and I assumed that includes calling close().

Yes. The POSIX spec is clearer:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/fdopendir.html
"Upon successful return from fdopendir(), the file descriptor is under
the control of the system, and if any attempt is made to close the file descriptor, or to modify the state of the associated description, other than by means of closedir(), readdir(), readdir_r(), rewinddir(), or seekdir(), the behavior is undefined. Upon calling closedir() the file descriptor shall be closed."

Quoted 2 lines

But I've seen the Coverity message warning this one too, so maybe I'm wrong ...

If coverity insists on a close(fd) then that's a coverity bug :-)

thanks
-- PMM

#4 lore raw
Quoted 18 lines · Peter Maydell
Quoted 13 lines · Gerd Hoffmann

hw/usb/dev-mtp.c static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) · line 686

Quoted 8 lines · Li Qiang

Spotted by Coverity: CID 1397070

#ifdef CONFIG_INOTIFY1

hw/usb/dev-mtp.c +1 -0
@@ -682,6 +683,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
         usb_mtp_add_child(s, o, entry->d_name);
     }
     closedir(dir);
+    close(fd);

Not fully sure this is correct.

Quoted 3 lines

The fdopendir manpage says the app should not use fd any more after successfully calling fdopendir(), and I assumed that includes calling close().

Quoted 8 lines

Yes. The POSIX spec is clearer:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/fdopendir.html
"Upon successful return from fdopendir(), the file descriptor is under
the control of the system, and if any attempt is made to close the file descriptor, or to modify the state of the associated description, other than by means of closedir(), readdir(), readdir_r(), rewinddir(), or seekdir(), the behavior is undefined. Upon calling closedir() the file descriptor shall be closed."

Thanks for looking it up.

Patch added to usb queue, with the second chunk dropped.

cheers,
Gerd