Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-10-04 04:38:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

system/coredump:fix coverity bug

Browse source 
check read return, avoid dead loop if read return zero

Signed-off-by: anjiahao <anjiahao@xiaomi.com>
This commit is contained in:
anjiahao 2024-02-02 15:08:07 +08:00 • committed by Xiang Xiao
parent 03f3ce7fd4
commit b99f92bac5
1 changed files with 54 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

61
system/coredump/coredump.c
View file

@ -103,10 +103,15 @@ static void dumpfile_delete(FAR char *path, FAR const char *filename,
FAR void *arg)
{
FAR char *dumppath = arg;
int ret;
sprintf(dumppath, "%s/%s", path, filename);
printf("Remove %s\n", dumppath);
remove(dumppath);
ret = remove(dumppath);
if (ret < 0)
{
printf("Remove %s fail\n", dumppath);
}
}
/****************************************************************************
@ -116,8 +121,12 @@ static void dumpfile_delete(FAR char *path, FAR const char *filename,
static void coredump_restore(FAR char *savepath, size_t maxfile)
{
FAR struct coredump_info_s *info;
char dumppath[PATH_MAX] =
{
0
};
unsigned char *swap;
char dumppath[PATH_MAX];
struct geometry geo;
ssize_t writesize;
ssize_t readsize;
@ -126,6 +135,7 @@ static void coredump_restore(FAR char *savepath, size_t maxfile)
size_t max = 0;
int dumpfd;
int blkfd;
off_t off;
int ret;
blkfd = open(CONFIG_BOARD_COREDUMP_BLKDEV_PATH, O_RDWR);
@ -146,8 +156,20 @@ static void coredump_restore(FAR char *savepath, size_t maxfile)
goto blkfd_err;
}
lseek(blkfd, (geo.geo_nsectors - 1) * geo.geo_sectorsize, SEEK_SET);
read(blkfd, info, geo.geo_sectorsize);
off = lseek(blkfd, (geo.geo_nsectors - 1) * geo.geo_sectorsize, SEEK_SET);
if (off < 0)
{
printf("Seek %s fail\n", CONFIG_BOARD_COREDUMP_BLKDEV_PATH);
goto info_err;
}
readsize = read(blkfd, info, geo.geo_sectorsize);
if (readsize != geo.geo_sectorsize)
{
printf("Read %s fail\n", CONFIG_BOARD_COREDUMP_BLKDEV_PATH);
goto info_err;
}
if (info->magic != COREDUMP_MAGIC)
{
printf("%s coredump not found!\n", CONFIG_BOARD_COREDUMP_BLKDEV_PATH);
@ -220,6 +242,10 @@ static void coredump_restore(FAR char *savepath, size_t maxfile)
printf("Read %s fail\n", CONFIG_BOARD_COREDUMP_BLKDEV_PATH);
break;
}
else if (readsize == 0)
{
break;
}
writesize = write(dumpfd, swap, readsize);
if (writesize != readsize)
@ -231,10 +257,31 @@ static void coredump_restore(FAR char *savepath, size_t maxfile)
offset += writesize;
}
printf("Coredump finish [%s][%zu]\n", dumppath, info->size);
if (offset < info->size)
{
printf("Coredump error [%s] need [%zu], but just get %zu\n",
dumppath, info->size, offset);
}
else
{
printf("Coredump finish [%s][%zu]\n", dumppath, info->size);
}
info->magic = 0;
lseek(blkfd, (geo.geo_nsectors - 1) * geo.geo_sectorsize, SEEK_SET);
write(blkfd, info, geo.geo_sectorsize);
off = lseek(blkfd, (geo.geo_nsectors - 1) * geo.geo_sectorsize, SEEK_SET);
if (off < 0)
{
printf("Seek %s fail\n", CONFIG_BOARD_COREDUMP_BLKDEV_PATH);
goto swap_err;
}
writesize = write(blkfd, info, geo.geo_sectorsize);
if (writesize != geo.geo_sectorsize)
{
printf("Write %s fail\n", CONFIG_BOARD_COREDUMP_BLKDEV_PATH);
}
swap_err:
free(swap);
fd_err:
close(dumpfd);