From 9613a5795c60b240e677765aef6a92a055efe921 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 5 Nov 2016 08:28:51 +0100 Subject: [PATCH] boot: Use snprintf() when filling command_errbuf[] w/ dynamic content. Taken-from: FreeBSD --- sys/boot/common/boot.c | 7 ++-- sys/boot/common/bootstrap.h | 4 +- sys/boot/common/commands.c | 17 +++++--- sys/boot/common/do_dloader.c | 3 +- sys/boot/common/ls.c | 13 +++--- sys/boot/common/module.c | 57 ++++++++++++++++----------- sys/boot/efi/loader/arch/x86_64/framebuffer.c | 31 ++++++++------- 7 files changed, 77 insertions(+), 55 deletions(-) diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c index db33ffba7b..48cde2b33d 100644 --- a/sys/boot/common/boot.c +++ b/sys/boot/common/boot.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/common/boot.c,v 1.29 2003/08/25 23:30:41 obrien Exp $ - * $DragonFly: src/sys/boot/common/boot.c,v 1.4 2005/12/10 00:39:48 swildner Exp $ */ /* @@ -63,7 +62,8 @@ command_boot(int argc, char *argv[]) /* XXX maybe we should discard everything and start again? */ if (file_findfile(NULL, NULL) != NULL) { - sprintf(command_errbuf, "can't boot '%s', kernel module already loaded", argv[1]); + snprintf(command_errbuf, sizeof(command_errbuf), + "can't boot '%s', kernel module already loaded", argv[1]); return(CMD_ERROR); } @@ -157,7 +157,8 @@ command_autoboot(int argc, char *argv[]) case 2: howlong = strtol(argv[1], &cp, 0); if (*cp != 0) { - sprintf(command_errbuf, "bad delay '%s'", argv[1]); + snprintf(command_errbuf, sizeof(command_errbuf), + "bad delay '%s'", argv[1]); return(CMD_ERROR); } /* FALLTHROUGH */ diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h index cdd76d4a9e..45ed5fd2e5 100644 --- a/sys/boot/common/bootstrap.h +++ b/sys/boot/common/bootstrap.h @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.38 2003/05/01 03:56:29 peter Exp $ - * $DragonFly: src/sys/boot/common/bootstrap.h,v 1.4 2008/09/02 17:21:12 dillon Exp $ */ #include @@ -50,8 +49,9 @@ struct devdesc /* Commands and return values; nonzero return sets command_errmsg != NULL */ typedef int (bootblk_cmd_t)(int argc, char *argv[]); +#define COMMAND_ERRBUFSZ (256) extern char *command_errmsg; -extern char command_errbuf[]; /* XXX blah, length */ +extern char command_errbuf[COMMAND_ERRBUFSZ]; extern int CurrentCondition; #define CMD_OK 0 #define CMD_ERROR 1 diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c index ff6c816aae..cd472a2349 100644 --- a/sys/boot/common/commands.c +++ b/sys/boot/common/commands.c @@ -32,7 +32,7 @@ #include "bootstrap.h" char *command_errmsg; -char command_errbuf[256]; +char command_errbuf[COMMAND_ERRBUFSZ]; int CurrentCondition = 1; static int page_file(char *filename); @@ -197,7 +197,8 @@ command_help(int argc, char *argv[]) pager_close(); close(hfd); if (!matched) { - sprintf(command_errbuf, "no help available for '%s'", topic); + snprintf(command_errbuf, sizeof(command_errbuf), + "no help available for '%s'", topic); free(topic); if (subtopic) free(subtopic); @@ -264,7 +265,8 @@ command_show(int argc, char *argv[]) if ((cp = getenv(argv[1])) != NULL) { printf("%s\n", cp); } else { - sprintf(command_errbuf, "variable '%s' not found", argv[1]); + snprintf(command_errbuf, sizeof(command_errbuf), + "variable '%s' not found", argv[1]); return(CMD_ERROR); } } @@ -370,7 +372,8 @@ command_read(int argc, char *argv[]) case 't': timeout = strtol(optarg, &cp, 0); if (cp == optarg) { - sprintf(command_errbuf, "bad timeout '%s'", optarg); + snprintf(command_errbuf, sizeof(command_errbuf), + "bad timeout '%s'", optarg); return(CMD_ERROR); } break; @@ -449,8 +452,10 @@ page_file(char *filename) } else { result = -1; } - if (result == -1) - sprintf(command_errbuf, "error showing %s", filename); + if (result == -1) { + snprintf(command_errbuf, sizeof(command_errbuf), + "error showing %s", filename); + } return result; } diff --git a/sys/boot/common/do_dloader.c b/sys/boot/common/do_dloader.c index d57035e09c..5596e2eaf2 100644 --- a/sys/boot/common/do_dloader.c +++ b/sys/boot/common/do_dloader.c @@ -218,7 +218,8 @@ include(const char *filename) if (((fd = rel_open(filename, NULL, O_RDONLY)) == -1)) { command_errmsg = command_errbuf; - snprintf(command_errbuf, 256, "cannot find \"%s\"", filename); + snprintf(command_errbuf, sizeof(command_errbuf), + "cannot find \"%s\"", filename); return(CMD_ERROR); } diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c index 1f7c069ef7..1bc3bdd450 100644 --- a/sys/boot/common/ls.c +++ b/sys/boot/common/ls.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/common/ls.c,v 1.11 2003/08/25 23:30:41 obrien Exp $ - * $DragonFly: src/sys/boot/common/ls.c,v 1.5 2008/09/02 17:21:12 dillon Exp $ */ #include @@ -148,21 +147,25 @@ ls_getdir(char **pathp) /* Make sure the path is respectable to begin with */ if (archsw.arch_getdev(NULL, path, &cp)) { - sprintf(command_errbuf, "bad path '%s'", path); + snprintf(command_errbuf, sizeof(command_errbuf), + "bad path '%s'", path); goto out; } fd = rel_open(cp, NULL, O_RDONLY); if (fd < 0) { - sprintf(command_errbuf, "open '%s' failed: %s", path, strerror(errno)); + snprintf(command_errbuf, sizeof(command_errbuf), + "open '%s' failed: %s", path, strerror(errno)); goto out; } if (fstat(fd, &sb) < 0) { - sprintf(command_errbuf, "stat failed: %s", strerror(errno)); + snprintf(command_errbuf, sizeof(command_errbuf), + "stat failed: %s", strerror(errno)); goto out; } if (!S_ISDIR(sb.st_mode)) { - sprintf(command_errbuf, "%s: %s", path, strerror(ENOTDIR)); + snprintf(command_errbuf, sizeof(command_errbuf), + "%s: %s", path, strerror(ENOTDIR)); goto out; } diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c index fec141f482..449e64dede 100644 --- a/sys/boot/common/module.c +++ b/sys/boot/common/module.c @@ -164,16 +164,20 @@ command_load(int argc, char *argv[]) */ if (dokld || file_havepath(argv[1])) { error = mod_loadkld(argv[1], argc - 2, argv + 2); - if (error == EEXIST) - sprintf(command_errbuf, "warning: KLD '%s' already loaded", argv[1]); + if (error == EEXIST) { + snprintf(command_errbuf, sizeof(command_errbuf), + "warning: KLD '%s' already loaded", argv[1]); + } return (error == 0 ? CMD_OK : CMD_ERROR); } /* * Looks like a request for a module. */ error = mod_load(argv[1], NULL, argc - 2, argv + 2); - if (error == EEXIST) - sprintf(command_errbuf, "warning: module '%s' already loaded", argv[1]); + if (error == EEXIST) { + snprintf(command_errbuf, sizeof(command_errbuf), + "warning: module '%s' already loaded", argv[1]); + } return (error == 0 ? CMD_OK : CMD_ERROR); } @@ -222,16 +226,16 @@ command_crc(int argc, char *argv[]) /* locate the file on the load path */ cp = file_search(argv[i], NULL); if (cp == NULL) { - sprintf(command_errbuf, "can't find '%s'", argv[i]); + snprintf(command_errbuf, sizeof(command_errbuf), + "can't find '%s'", argv[i]); error = CMD_ERROR; break; } name = cp; if ((fd = rel_open(name, NULL, O_RDONLY)) < 0) { - sprintf(command_errbuf, - "can't open '%s': %s", - name, strerror(errno)); + snprintf(command_errbuf, sizeof(command_errbuf), + "can't open '%s': %s", name, strerror(errno)); free(name); error = CMD_ERROR; break; @@ -340,8 +344,8 @@ file_load(char *filename, vm_offset_t dest, struct preloaded_file **result) if (error == EFTYPE) continue; /* Unknown to this handler? */ if (error) { - sprintf(command_errbuf, "can't load file '%s': %s", - filename, strerror(error)); + snprintf(command_errbuf, sizeof(command_errbuf), + "can't load file '%s': %s", filename, strerror(error)); break; } } @@ -377,8 +381,8 @@ file_load_dependencies(struct preloaded_file *base_file) */ mp = file_findmodule(NULL, dmodname, verinfo); if (mp == NULL) { - sprintf(command_errbuf, "module '%s' exists but with wrong version", - dmodname); + snprintf(command_errbuf, sizeof(command_errbuf), + "module '%s' exists but with wrong version", dmodname); error = ENOENT; break; } @@ -417,13 +421,15 @@ file_loadraw(char *type, char *name) /* locate the file on the load path */ cp = file_search(name, NULL); if (cp == NULL) { - sprintf(command_errbuf, "can't find '%s'", name); + snprintf(command_errbuf, sizeof(command_errbuf), + "can't find '%s'", name); return(CMD_ERROR); } name = cp; if ((fd = rel_open(name, NULL, O_RDONLY)) < 0) { - sprintf(command_errbuf, "can't open '%s': %s", name, strerror(errno)); + snprintf(command_errbuf, sizeof(command_errbuf), + "can't open '%s': %s", name, strerror(errno)); free(name); return(CMD_ERROR); } @@ -433,8 +439,8 @@ file_loadraw(char *type, char *name) /* read in 4k chunks; size is not really important */ #ifndef EFI if (laddr + 4096 > heapbase) { - sprintf(command_errbuf, "error reading '%s': out of load memory", - name); + snprintf(command_errbuf, sizeof(command_errbuf), + "error reading '%s': out of load memory", name); free(name); close(fd); return(CMD_ERROR); @@ -444,8 +450,8 @@ file_loadraw(char *type, char *name) if (got == 0) /* end of file */ break; if (got < 0) { /* error */ - sprintf(command_errbuf, "error reading '%s': %s", - name, strerror(errno)); + snprintf(command_errbuf, sizeof(command_errbuf), + "error reading '%s': %s", name, strerror(errno)); free(name); close(fd); return(CMD_ERROR); @@ -496,13 +502,15 @@ mod_load(char *modname, struct mod_depend *verinfo, int argc, char *argv[]) free(mp->m_args); mp->m_args = unargv(argc, argv); #endif - sprintf(command_errbuf, "warning: module '%s' already loaded", mp->m_name); + snprintf(command_errbuf, sizeof(command_errbuf), + "warning: module '%s' already loaded", mp->m_name); return (0); } /* locate file with the module on the search path */ filename = mod_searchmodule(modname, verinfo); if (filename == NULL) { - sprintf(command_errbuf, "can't find '%s'", modname); + snprintf(command_errbuf, sizeof(command_errbuf), + "can't find '%s'", modname); return (ENOENT); } err = mod_loadkld(filename, argc, argv); @@ -525,7 +533,8 @@ mod_loadkld(const char *kldname, int argc, char *argv[]) */ filename = file_search(kldname, kld_ext_list); if (filename == NULL) { - sprintf(command_errbuf, "can't find '%s'", kldname); + snprintf(command_errbuf, sizeof(command_errbuf), + "can't find '%s'", kldname); return (ENOENT); } /* @@ -533,7 +542,8 @@ mod_loadkld(const char *kldname, int argc, char *argv[]) */ fp = file_findfile(filename, NULL); if (fp) { - sprintf(command_errbuf, "warning: KLD '%s' already loaded", filename); + snprintf(command_errbuf, sizeof(command_errbuf), + "warning: KLD '%s' already loaded", filename); free(filename); return (0); } @@ -558,7 +568,8 @@ mod_loadkld(const char *kldname, int argc, char *argv[]) } } while(0); if (err == EFTYPE) - sprintf(command_errbuf, "don't know how to load module '%s'", filename); + snprintf(command_errbuf, sizeof(command_errbuf), + "don't know how to load module '%s'", filename); if (err && fp) file_discard(fp); free(filename); diff --git a/sys/boot/efi/loader/arch/x86_64/framebuffer.c b/sys/boot/efi/loader/arch/x86_64/framebuffer.c index 2e0c3f9b12..fd98ed9562 100644 --- a/sys/boot/efi/loader/arch/x86_64/framebuffer.c +++ b/sys/boot/efi/loader/arch/x86_64/framebuffer.c @@ -24,11 +24,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: head/sys/boot/efi/loader/arch/amd64/framebuffer.c 304532 2016-08-20 16:23:19Z tsoome $ */ -#include -__FBSDID("$FreeBSD: head/sys/boot/efi/loader/arch/amd64/framebuffer.c 293724 2016-01-12 02:17:39Z smh $"); - #include #include #include @@ -474,8 +473,9 @@ command_gop(int argc, char *argv[]) status = BS->LocateProtocol(&gop_guid, NULL, (VOID **)&gop); if (EFI_ERROR(status)) { - sprintf(command_errbuf, "%s: Graphics Output Protocol not " - "present (error=%lu)", argv[0], EFI_ERROR_CODE(status)); + snprintf(command_errbuf, sizeof(command_errbuf), + "%s: Graphics Output Protocol not present (error=%lu)", + argv[0], EFI_ERROR_CODE(status)); return (CMD_ERROR); } @@ -494,9 +494,9 @@ command_gop(int argc, char *argv[]) } status = gop->SetMode(gop, mode); if (EFI_ERROR(status)) { - sprintf(command_errbuf, "%s: Unable to set mode to " - "%u (error=%lu)", argv[0], mode, - EFI_ERROR_CODE(status)); + snprintf(command_errbuf, sizeof(command_errbuf), + "%s: Unable to set mode to %u (error=%lu)", + argv[0], mode, EFI_ERROR_CODE(status)); return (CMD_ERROR); } } else if (!strcmp(argv[1], "get")) { @@ -526,8 +526,8 @@ command_gop(int argc, char *argv[]) return (CMD_OK); usage: - sprintf(command_errbuf, "usage: %s [list | get | set ]", - argv[0]); + snprintf(command_errbuf, sizeof(command_errbuf), + "usage: %s [list | get | set ]", argv[0]); return (CMD_ERROR); } @@ -542,8 +542,9 @@ command_uga(int argc, char *argv[]) status = BS->LocateProtocol(&uga_guid, NULL, (VOID **)&uga); if (EFI_ERROR(status)) { - sprintf(command_errbuf, "%s: UGA Protocol not present " - "(error=%lu)", argv[0], EFI_ERROR_CODE(status)); + snprintf(command_errbuf, sizeof(command_errbuf), + "%s: UGA Protocol not present (error=%lu)", + argv[0], EFI_ERROR_CODE(status)); return (CMD_ERROR); } @@ -551,8 +552,8 @@ command_uga(int argc, char *argv[]) goto usage; if (efifb_from_uga(&efifb, uga) != CMD_OK) { - sprintf(command_errbuf, "%s: Unable to get UGA information", - argv[0]); + snprintf(command_errbuf, sizeof(command_errbuf), + "%s: Unable to get UGA information", argv[0]); return (CMD_ERROR); } @@ -561,6 +562,6 @@ command_uga(int argc, char *argv[]) return (CMD_OK); usage: - sprintf(command_errbuf, "usage: %s", argv[0]); + snprintf(command_errbuf, sizeof(command_errbuf), "usage: %s", argv[0]); return (CMD_ERROR); } -- 2.11.4.GIT