mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-07 13:14:51 +00:00
Code Issues Releases Activity

Fix a file descriptor leak in cam_open_btl(). The xpt device was opened,

Browse Source 
but never closed.

Submitted by:	amobbs@allstor-sw.co.uk
This commit is contained in:
Kenneth D. Merry 1999-09-12 19:40:20 +00:00
parent 32952d4b37
commit 661d7edf84
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=51213
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libcam/camlib.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998 Kenneth D. Merry. * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -357,6 +357,7 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
if (ccb.cdm.matches == NULL) { if (ccb.cdm.matches == NULL) {
snprintf(cam_errbuf, CAM_ERRBUF_SIZE, snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
"%s: couldn't malloc match buffer", func_name); "%s: couldn't malloc match buffer", func_name);
close(fd);
return(NULL); return(NULL);
} }
ccb.cdm.num_matches = 0; ccb.cdm.num_matches = 0;
@ -370,6 +371,7 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
snprintf(cam_errbuf, CAM_ERRBUF_SIZE, snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
"%s: couldn't malloc pattern buffer", func_name); "%s: couldn't malloc pattern buffer", func_name);
free(ccb.cdm.matches); free(ccb.cdm.matches);
close(fd);
return(NULL); return(NULL);
} }
ccb.cdm.patterns[0].type = DEV_MATCH_PERIPH; ccb.cdm.patterns[0].type = DEV_MATCH_PERIPH;
@ -429,6 +431,7 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
pass_unit = periph_result->unit_number; pass_unit = periph_result->unit_number;
free(ccb.cdm.matches); free(ccb.cdm.matches);
free(ccb.cdm.patterns); free(ccb.cdm.patterns);
close(fd);
sprintf(dev_path, "/dev/pass%d", pass_unit); sprintf(dev_path, "/dev/pass%d", pass_unit);
return(cam_real_open_device(dev_path, flags, device, NULL, return(cam_real_open_device(dev_path, flags, device, NULL,
NULL, 0)); NULL, 0));
@ -444,6 +447,7 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
btl_bailout: btl_bailout:
free(ccb.cdm.matches); free(ccb.cdm.matches);
free(ccb.cdm.patterns); free(ccb.cdm.patterns);
close(fd);
return(NULL); return(NULL);
} }