mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
fsstress: fix memory leak in do_aio_rw
If io_submit or io_getevents fails, the do_aio_rw() won't free the "buf" and cause memory leak. Signed-off-by: Zorro Lang <zlang@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
+19
-20
@@ -2078,11 +2078,11 @@ void
|
|||||||
do_aio_rw(int opno, long r, int flags)
|
do_aio_rw(int opno, long r, int flags)
|
||||||
{
|
{
|
||||||
int64_t align;
|
int64_t align;
|
||||||
char *buf;
|
char *buf = NULL;
|
||||||
struct dioattr diob;
|
struct dioattr diob;
|
||||||
int e;
|
int e;
|
||||||
pathname_t f;
|
pathname_t f;
|
||||||
int fd;
|
int fd = -1;
|
||||||
size_t len;
|
size_t len;
|
||||||
int64_t lr;
|
int64_t lr;
|
||||||
off64_t off;
|
off64_t off;
|
||||||
@@ -2099,8 +2099,7 @@ do_aio_rw(int opno, long r, int flags)
|
|||||||
if (!get_fname(FT_REGFILE, r, &f, NULL, NULL, &v)) {
|
if (!get_fname(FT_REGFILE, r, &f, NULL, NULL, &v)) {
|
||||||
if (v)
|
if (v)
|
||||||
printf("%d/%d: do_aio_rw - no filename\n", procid, opno);
|
printf("%d/%d: do_aio_rw - no filename\n", procid, opno);
|
||||||
free_pathname(&f);
|
goto aio_out;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
fd = open_path(&f, flags|O_DIRECT);
|
fd = open_path(&f, flags|O_DIRECT);
|
||||||
e = fd < 0 ? errno : 0;
|
e = fd < 0 ? errno : 0;
|
||||||
@@ -2109,25 +2108,20 @@ do_aio_rw(int opno, long r, int flags)
|
|||||||
if (v)
|
if (v)
|
||||||
printf("%d/%d: do_aio_rw - open %s failed %d\n",
|
printf("%d/%d: do_aio_rw - open %s failed %d\n",
|
||||||
procid, opno, f.path, e);
|
procid, opno, f.path, e);
|
||||||
free_pathname(&f);
|
goto aio_out;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
if (fstat64(fd, &stb) < 0) {
|
if (fstat64(fd, &stb) < 0) {
|
||||||
if (v)
|
if (v)
|
||||||
printf("%d/%d: do_aio_rw - fstat64 %s failed %d\n",
|
printf("%d/%d: do_aio_rw - fstat64 %s failed %d\n",
|
||||||
procid, opno, f.path, errno);
|
procid, opno, f.path, errno);
|
||||||
free_pathname(&f);
|
goto aio_out;
|
||||||
close(fd);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
inode_info(st, sizeof(st), &stb, v);
|
inode_info(st, sizeof(st), &stb, v);
|
||||||
if (!iswrite && stb.st_size == 0) {
|
if (!iswrite && stb.st_size == 0) {
|
||||||
if (v)
|
if (v)
|
||||||
printf("%d/%d: do_aio_rw - %s%s zero size\n", procid, opno,
|
printf("%d/%d: do_aio_rw - %s%s zero size\n", procid, opno,
|
||||||
f.path, st);
|
f.path, st);
|
||||||
free_pathname(&f);
|
goto aio_out;
|
||||||
close(fd);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
if (xfsctl(f.path, fd, XFS_IOC_DIOINFO, &diob) < 0) {
|
if (xfsctl(f.path, fd, XFS_IOC_DIOINFO, &diob) < 0) {
|
||||||
if (v)
|
if (v)
|
||||||
@@ -2150,6 +2144,12 @@ do_aio_rw(int opno, long r, int flags)
|
|||||||
else if (len > diob.d_maxiosz)
|
else if (len > diob.d_maxiosz)
|
||||||
len = diob.d_maxiosz;
|
len = diob.d_maxiosz;
|
||||||
buf = memalign(diob.d_mem, len);
|
buf = memalign(diob.d_mem, len);
|
||||||
|
if (!buf) {
|
||||||
|
if (v)
|
||||||
|
printf("%d/%d: do_aio_rw - memalign failed\n",
|
||||||
|
procid, opno);
|
||||||
|
goto aio_out;
|
||||||
|
}
|
||||||
|
|
||||||
if (iswrite) {
|
if (iswrite) {
|
||||||
off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
|
off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
|
||||||
@@ -2166,27 +2166,26 @@ do_aio_rw(int opno, long r, int flags)
|
|||||||
if (v)
|
if (v)
|
||||||
printf("%d/%d: %s - io_submit failed %d\n",
|
printf("%d/%d: %s - io_submit failed %d\n",
|
||||||
procid, opno, iswrite ? "awrite" : "aread", e);
|
procid, opno, iswrite ? "awrite" : "aread", e);
|
||||||
free_pathname(&f);
|
goto aio_out;
|
||||||
close(fd);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
if ((e = io_getevents(io_ctx, 1, 1, &event, NULL)) != 1) {
|
if ((e = io_getevents(io_ctx, 1, 1, &event, NULL)) != 1) {
|
||||||
if (v)
|
if (v)
|
||||||
printf("%d/%d: %s - io_getevents failed %d\n",
|
printf("%d/%d: %s - io_getevents failed %d\n",
|
||||||
procid, opno, iswrite ? "awrite" : "aread", e);
|
procid, opno, iswrite ? "awrite" : "aread", e);
|
||||||
free_pathname(&f);
|
goto aio_out;
|
||||||
close(fd);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
e = event.res != len ? event.res2 : 0;
|
e = event.res != len ? event.res2 : 0;
|
||||||
free(buf);
|
|
||||||
if (v)
|
if (v)
|
||||||
printf("%d/%d: %s %s%s [%lld,%d] %d\n",
|
printf("%d/%d: %s %s%s [%lld,%d] %d\n",
|
||||||
procid, opno, iswrite ? "awrite" : "aread",
|
procid, opno, iswrite ? "awrite" : "aread",
|
||||||
f.path, st, (long long)off, (int)len, e);
|
f.path, st, (long long)off, (int)len, e);
|
||||||
|
aio_out:
|
||||||
|
if (buf)
|
||||||
|
free(buf);
|
||||||
|
if (fd != -1)
|
||||||
|
close(fd);
|
||||||
free_pathname(&f);
|
free_pathname(&f);
|
||||||
close(fd);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user