From 3d09a65d42722de5d9fb09c52c1b45f683a2c8bd Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Wed, 4 Jul 2001 07:43:10 +0000 Subject: [PATCH] Make sure you don't have a file descriptor leak for the 'real' underlying CAM device. This needs to be checked not only in the open routine, but the device->fd has to be initialized as well. PR: 28688 Submitted (partially) by: T. William Wells MFC after: 2 weeks --- lib/libcam/camlib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c index 7c2a6cdc3ec..1c76303a8c8 100644 --- a/lib/libcam/camlib.c +++ b/lib/libcam/camlib.c @@ -554,7 +554,7 @@ cam_real_open_device(const char *path, int flags, struct cam_device *device, char newpath[MAXPATHLEN+1]; char *func_name = "cam_real_open_device"; union ccb ccb; - int fd, malloced_device = 0; + int fd = -1, malloced_device = 0; /* * See if the user wants us to malloc a device for him. @@ -567,6 +567,7 @@ cam_real_open_device(const char *path, int flags, struct cam_device *device, strerror(errno)); return(NULL); } + device->fd = -1; malloced_device = 1; } @@ -691,6 +692,9 @@ cam_real_open_device(const char *path, int flags, struct cam_device *device, crod_bailout: + if (fd >= 0) + close(fd); + if (malloced_device) free(device);