Author: ken
Date: Wed Aug 23 17:52:49 2017
New Revision: 322819
URL: https://svnweb.freebsd.org/changeset/base/322819
Log:
Fix a resource leak in an error case in camdd_buf_sg_create().
Submitted by: Coverity
CID: 1341622
MFC after: 3 days
Sponsored by: Spectra Logic
Modified:
head/usr.sbin/camdd/camdd.c
Modified: head/usr.sbin/camdd/camdd.c
==============================================================================
--- head/usr.sbin/camdd/camdd.c Wed Aug 23 17:47:57 2017 (r322818)
+++ head/usr.sbin/camdd/camdd.c Wed Aug 23 17:52:49 2017 (r322819)
@@ -824,6 +824,7 @@ camdd_buf_sg_create(struct camdd_buf *buf, int iovec,
struct camdd_buf_data *data;
uint8_t *extra_buf = NULL;
size_t extra_buf_len = 0;
+ int extra_buf_attached = 0;
int i, retval = 0;
data = &buf->buf_type_spec.data;
@@ -913,6 +914,7 @@ camdd_buf_sg_create(struct camdd_buf *buf, int iovec,
data->iovec[i].iov_base = extra_buf;
data->iovec[i].iov_len = extra_buf_len;
}
+ extra_buf_attached = 1;
i++;
}
if ((tmp_buf != NULL) || (i != data->sg_count)) {
@@ -926,6 +928,14 @@ bailout:
if (retval == 0) {
*num_sectors_used = (data->fill_len + extra_buf_len) /
sector_size;
+ } else if (extra_buf_attached == 0) {
+ /*
+ * If extra_buf isn't attached yet, we need to free it
+ * to avoid leaking.
+ */
+ free(extra_buf);
+ data->extra_buf = 0;
+ data->sg_count--;
}
return (retval);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
