len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-13 07:02:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add verification to multiboot redirect

Browse source 
check that a firmware file exists before we redirect
to an invalid directory

Change-Id: Id496fde3508158bc80f90dfb18a31ebae7229787
This commit is contained in:
William Wilgus 2024-08-18 13:11:59 -04:00
parent ea0e3704a8
commit 3b040673cc
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
firmware/include/dircache_redirect.h
View file

@ -24,6 +24,7 @@
#include "pathfuncs.h" #include "pathfuncs.h"
#include "dir.h" #include "dir.h"
#include "dircache.h" #include "dircache.h"
#include "file.h"
#if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR) && !defined(BOOTLOADER) #if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR) && !defined(BOOTLOADER)
#include "rb-loader.h" #include "rb-loader.h"
@ -185,22 +186,33 @@ static inline void volume_onmount_internal(IF_MV_NONVOID(int volume))
if (multiboot_is_boot_volume(IF_MV_VOL(volume))) if (multiboot_is_boot_volume(IF_MV_VOL(volume)))
{ {
int rtlen = get_redirect_dir(rtpath, sizeof(rtpath), volume, "", ""); /* get the full path to the BOOTFILE
while (rtlen > 0 && rtpath[--rtlen] == PATH_SEPCH) ie. /<0>/redirectdir/.rockbox/rockbox.ext */
rtpath[rtlen] = '\0'; /* remove extra separators */ int rtlen = get_redirect_dir(rtpath, sizeof(rtpath),
volume, BOOTDIR, BOOTFILE);
if (rtlen <= 0 || rtlen >= (int) sizeof(rtpath))
rtlen = 0; /* path too long or sprintf error */
else if (file_exists(rtpath))
{
rtlen = get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "");
while (rtlen > 0 && rtpath[--rtlen] == PATH_SEPCH)
rtpath[rtlen] = '\0'; /* remove separators */
}
else
rtlen = 0; /* No BOOTFILE found */
#if 0 /*removed, causes issues with playback for now?*/ #if 0 /*removed, causes issues with playback for now?*/
if (rtlen <= 0 || rtpath[rtlen] == VOL_END_TOK) if (rtlen <= 0 || rtpath[rtlen] == VOL_END_TOK)
root_unmount_volume(volume); /* unmount so root can be hidden*/ root_unmount_volume(volume); /* unmount so root can be hidden*/
#endif #endif
if (rtlen <= 0) /* Error occurred, card removed? Set root to default */ if (rtlen <= 0 || root_mount_path(rtpath, NSITEM_CONTENTS) != 0)
{ { /* Error occurred, card removed? Set root to default */
boot_data_valid = false;
root_unmount_volume(volume); /* unmount so root can be hidden*/ root_unmount_volume(volume); /* unmount so root can be hidden*/
goto standard_redirect; goto standard_redirect;
} }
root_mount_path(rtpath, NSITEM_CONTENTS);
} }
} }
else else
{ {