From bf7ff5045c22c382a0668fd6c313df3d240d48d8 Mon Sep 17 00:00:00 2001 From: jilles Date: Sat, 15 Aug 2015 19:58:00 +0000 Subject: [PATCH] MFC r284779: sh: Fix some arithmetic undefined behaviour. Fix shifts of possibly negative numbers found with ubsan and avoid signed integer overflow when hashing an extremely long command name. git-svn-id: svn://svn.freebsd.org/base/stable/10@286813 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- bin/sh/alias.c | 2 +- bin/sh/exec.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/sh/alias.c b/bin/sh/alias.c index 21f3f44a3..a77ce99a9 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -248,7 +248,7 @@ hashalias(const char *p) { unsigned int hashval; - hashval = *p << 4; + hashval = (unsigned char)*p << 4; while (*p) hashval+= *p++; return &atab[hashval % ATABSIZE]; diff --git a/bin/sh/exec.c b/bin/sh/exec.c index e547e3136..d245b55e4 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -524,17 +524,16 @@ static struct tblentry **lastcmdentry; static struct tblentry * cmdlookup(const char *name, int add) { - int hashval; + unsigned int hashval; const char *p; struct tblentry *cmdp; struct tblentry **pp; size_t len; p = name; - hashval = *p << 4; + hashval = (unsigned char)*p << 4; while (*p) hashval += *p++; - hashval &= 0x7FFF; pp = &cmdtable[hashval % CMDTABLESIZE]; for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) { if (equal(cmdp->cmdname, name)) -- 2.42.0