Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

libblock: PR2040: Avoid NULL pointer access

Browse Source 
This partly reverts commit 08b9d53460.

Avoid a NULL pointer access and perform the source segment erase if
necessary.
This commit is contained in:
Sebastian Huber
2013-08-23 09:02:40 +02:00
parent 356b8c7baa
commit db99ce7ced
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cpukit/libblock/src/flashdisk.c
View File

@@ -1263,12 +1263,6 @@ rtems_fdisk_recycle_segment (rtems_flashdisk* fd,
{ {
rtems_fdisk_page_desc* spd = &ssc->page_descriptors[spage]; rtems_fdisk_page_desc* spd = &ssc->page_descriptors[spage];
if (!dsc && ssc->pages_active > 0)
{
rtems_fdisk_error ("recycle: no available dst segment");
return EIO;
}
if (rtems_fdisk_page_desc_flags_set (spd, RTEMS_FDISK_PAGE_ACTIVE) && if (rtems_fdisk_page_desc_flags_set (spd, RTEMS_FDISK_PAGE_ACTIVE) &&
!rtems_fdisk_page_desc_flags_set (spd, RTEMS_FDISK_PAGE_USED)) !rtems_fdisk_page_desc_flags_set (spd, RTEMS_FDISK_PAGE_USED))
{ {
@@ -1358,7 +1352,23 @@ rtems_fdisk_recycle_segment (rtems_flashdisk* fd,
*/ */
dst_pages = rtems_fdisk_seg_pages_available (dsc); dst_pages = rtems_fdisk_seg_pages_available (dsc);
if (dst_pages == 0) if (dst_pages == 0)
{
dsc = rtems_fdisk_seg_most_available (&fd->available); dsc = rtems_fdisk_seg_most_available (&fd->available);
if (!dsc)
{
if (ssc->pages_active == 0)
{
ret = rtems_fdisk_erase_segment (fd, ssc);
}
else
{
rtems_fdisk_error ("recycle: no available dst segment");
ret = EIO;
}
return ret;
}
}
(*pages)--; (*pages)--;
} }