packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prepare-root: check return codes for errors when assembling paths 

This adds checks around all `snprintf` calls in order to detect
failures and gracefully abort.
This commit is contained in:
Luca BRUNO 2021-10-26 12:12:48 +00:00
parent 1e6077af03
commit ca84da679a
No known key found for this signature in database
GPG Key ID: A9834A2252078E4E
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/switchroot/ostree-prepare-root.c
View File

@ -135,7 +135,8 @@ resolve_deploy_path (const char * root_mountpoint)
if (!ostree_target) if (!ostree_target)
errx (EXIT_FAILURE, "No OSTree target; expected ostree=/ostree/boot.N/..."); errx (EXIT_FAILURE, "No OSTree target; expected ostree=/ostree/boot.N/...");
snprintf (destpath, sizeof(destpath), "%s/%s", root_mountpoint, ostree_target); if (snprintf (destpath, sizeof(destpath), "%s/%s", root_mountpoint, ostree_target) < 0)
err (EXIT_FAILURE, "failed to assemble ostree target path");
if (lstat (destpath, &stbuf) < 0) if (lstat (destpath, &stbuf) < 0)
err (EXIT_FAILURE, "Couldn't find specified OSTree root '%s'", destpath); err (EXIT_FAILURE, "Couldn't find specified OSTree root '%s'", destpath);
if (!S_ISLNK (stbuf.st_mode)) if (!S_ISLNK (stbuf.st_mode))
@ -287,12 +288,14 @@ main(int argc, char *argv[])
char srcpath[PATH_MAX]; char srcpath[PATH_MAX];
/* If /boot is on the same partition, use a bind mount to make it visible /* If /boot is on the same partition, use a bind mount to make it visible
* at /boot inside the deployment. */ * at /boot inside the deployment. */
snprintf (srcpath, sizeof(srcpath), "%s/boot/loader", root_mountpoint); if (snprintf (srcpath, sizeof(srcpath), "%s/boot/loader", root_mountpoint) < 0)
err (EXIT_FAILURE, "failed to assemble /boot/loader path");
if (lstat (srcpath, &stbuf) == 0 && S_ISLNK (stbuf.st_mode)) if (lstat (srcpath, &stbuf) == 0 && S_ISLNK (stbuf.st_mode))
{ {
if (lstat ("boot", &stbuf) == 0 && S_ISDIR (stbuf.st_mode)) if (lstat ("boot", &stbuf) == 0 && S_ISDIR (stbuf.st_mode))
{ {
snprintf (srcpath, sizeof(srcpath), "%s/boot", root_mountpoint); if (snprintf (srcpath, sizeof(srcpath), "%s/boot", root_mountpoint) < 0)
err (EXIT_FAILURE, "failed to assemble /boot path");
if (mount (srcpath, "boot", NULL, MS_BIND | MS_SILENT, NULL) < 0) if (mount (srcpath, "boot", NULL, MS_BIND | MS_SILENT, NULL) < 0)
err (EXIT_FAILURE, "failed to bind mount %s to boot", srcpath); err (EXIT_FAILURE, "failed to bind mount %s to boot", srcpath);
} }