2 files changed, 22 insertions, 16 deletions

diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 880ffab01..88baf51dc 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -23,6 +23,14 @@ static void cpuid(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
         );
 }
 static smallint shaNI;
+static int get_shaNI(void)
+{
+        unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
+        cpuid(&eax, &ebx, &ecx, &edx);
+        ebx = ((ebx >> 28) & 2) - 1; /* bit 29 -> 1 or -1 */
+        shaNI = (int)ebx;
+        return (int)ebx;
+}
 void FAST_FUNC sha1_process_block64_shaNI(sha1_ctx_t *ctx);
 void FAST_FUNC sha256_process_block64_shaNI(sha256_ctx_t *ctx);
 #  if defined(__i386__)
@@ -1175,12 +1183,10 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
 #if ENABLE_SHA1_HWACCEL
 # if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
         {
-                if (!shaNI) {
-                        unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
-                        cpuid(&eax, &ebx, &ecx, &edx);
-                        shaNI = ((ebx >> 29) << 1) - 1;
-                }
-                if (shaNI > 0)
+                int ni = shaNI;
+                if (!ni)
+                        ni = get_shaNI();
+                if (ni > 0)
                         ctx->process_block = sha1_process_block64_shaNI;
         }
 # endif
@@ -1229,12 +1235,10 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
 #if ENABLE_SHA256_HWACCEL
 # if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
         {
-                if (!shaNI) {
-                        unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
-                        cpuid(&eax, &ebx, &ecx, &edx);
-                        shaNI = ((ebx >> 29) << 1) - 1;
-                }
-                if (shaNI > 0)
+                int ni = shaNI;
+                if (!ni)
+                        ni = get_shaNI();
+                if (ni > 0)
                         ctx->process_block = sha256_process_block64_shaNI;
         }
 # endif
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 62beb6a5d..3845c0892 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -273,10 +273,12 @@ pid_t FAST_FUNC fork_or_rexec(char **argv)
         /* fflush_all(); ? - so far all callers had no buffered output to flush */
 
         pid = xvfork();
-        if (pid) /* parent */
-                return pid;
-        /* child - re-exec ourself */
-        re_exec(argv);
+        if (pid == 0) /* child - re-exec ourself */
+                re_exec(argv); /* NORETURN */
+
+        /* parent */
+        argv[0][0] &= 0x7f; /* undo re_rexec() damage */
+        return pid;
 }
 #endif