bug fixes (kvs 2.0.0-rc)

- add debug printing if `--debug` or `-d` is passed to the KVS binary
- remove old RMASmoke references
- Add Darkn to credits for testing
- update arg_checks library
- add error checking in sysinfo

Makefile

@@ -5,7 +5,6 @@ SHELL ?= /bin/sh
 KVSFLIST := \
 	src/KVS/main.c \
 	src/KVS/tpm.c \
-	src/KVS/rmasmoke.c \
 	src/KVS/ui.c \
 	src/KVS/hex_utils.c
 
@@ -21,7 +20,6 @@ TOOL_BINS := $(patsubst %,build/$(ARCH)/tools/%,$(TOOLS))
 CFLAGS := \
 	-Iinclude \
 	-g \
-	-O3 \
 	-Llib \
 	-static
 
@@ -69,10 +67,10 @@ build/$(ARCH)/bin/kvg: src/KVG/main.rs
 install:
 	cp -r build/* /usr/local/
 
- clean:
+clean:
-    rm -rf build/$(ARCH)
+	rm -rf build/$(ARCH)
-    rm -rf target/$(TARGET)
+	rm -rf target/$(TARGET)
 
 deepclean:
-        rm -rf build
+	rm -rf build
-        rm -rf target
+	rm -rf target

README.md

@@ -3,7 +3,7 @@ KVS: Kernel Version Switcher (anti-rollback rollbacker)
 <br>
 [![build all](https://github.com/kxtzownsu/KVS-private/actions/workflows/build.yaml/badge.svg)](https://github.com/kxtzownsu/KVS-private/actions/workflows/build.yaml)
 
-<sub> my first real C project, the code may look like shit, dont get mad at me because of it! :3 </sub>
+<sub> my first real C project, the code may look like shit, dont get mad at me because of it! </sub>
 
 
 > [!IMPORTANT]  
@@ -46,3 +46,4 @@ Any legal trouble you recieve due to possessing a raw shim for KVS is not my res
 ## Credits
 kxtzownsu - writing KVS & KVG, porting to C <br />
 hannah - writing the `is_ti50` tool, moral support, testing <br />
+Darkn - testing

include/arg_checks.h

@@ -10,32 +10,35 @@
 int gargc;
 char **gargv;
 
-char *fval(const char *arg, int param)
+// fval("--parameter", 1) = "burger" (assuming --parameter burger was passed)
+char *fval(const char *arg, const char *shorthand, int param)
 {
 	for (int i = 0; i < gargc; i++) {
-		if (!strcmp(gargv[i], arg)) return gargv[i + param];
+		if (!strcmp(gargv[i], arg) || !strcmp(gargv[i], shorthand)) return gargv[i + param];
 	}
 
 	return "";
 }
 
-bool fbool(const char *arg)
+// fequals("--parameter"); = "burger" (assuming --parameter=burger was passed)
-{
-	for (int i = 0; i < gargc; i++) {
-		if (!strcmp(gargv[i], arg)) return true;
-	}
-
-	return false;
-}
-
 char *fequals(const char *arg)
 {
 	for (int i = 0; i < gargc; i++) {
-		if (!memcmp(gargv[i], arg, strlen(arg) - 1)) 
+		if (!memcmp(gargv[i], arg, strlen(arg) - 1))
 			return gargv[i] + strlen(arg) + 1;
 	}
 
 	return "";
 }
 
+// fbool("--parameter") == true (assuming --parameter was passed)
+bool fbool(const char *arg, const char *shorthand)
+{
+	for (int i = 0; i < gargc; i++) {
+		if (!strcmp(gargv[i], arg) || !strcmp(gargv[i], shorthand)) return true;
+	}
+
+	return false;
+}
+
 #endif

include/sysinfo.h

@@ -15,20 +15,28 @@ const char *KERNVER_TYPE = "N/A. This is an error, please report at https://gith
 const char* getFirmwareVersion(){
     // note, may not work on all chromebooks
     // I also don't wanna have to rely on the crossystem binary for it
-    FILE *fptr;
+
-    char stupidfile[] = "/sys/class/dmi/id/bios_version";
+    // i hate ChromeOS
-    fptr = fopen(stupidfile, "r");
+    FILE *fp;
+    #ifdef __x86_64__
+        char stupidfile[] = "/sys/class/platform/chromeos_acpi/FWID";
+    #elif defined(__aarch64__)
+        char stupidfile[] = "/proc/device-tree/firmware/chromeos/firmware-version";
+    #elif defined(__arm__)
+        char stupidfile[] = "/proc/device-tree/firmware/chromeos/firmware-version";
+    #endif
+    fp = fopen(stupidfile, "r");
     static char firmwareVersion[1024];
 
-    if (fptr == NULL) {
+    if (fp == NULL) {
         printf("Error reading Firmware Version\n");
         printf("Please report as a bug at https://github.com/kxtzownsu/KVS\n");
 
         sleep(86400);
         return "Error!"; 
     }
-    fgets(firmwareVersion, 100, fptr); 
+    fgets(firmwareVersion, 100, fp);
-    fclose(fptr);
+    fclose(fp);
     trim_newline(firmwareVersion);
 
     return firmwareVersion;
@@ -49,7 +57,13 @@ char* getKernver() {
     char cmd[] = "tpmc read 0x1008 9 2>/dev/null";
     static char output[26];
     FILE* fp = popen(cmd, "r");
-    fgets(output, sizeof(output), fp);
+    if (fgets(output, sizeof(output), fp) == NULL) {
+        printf("Error reading kernver\n");
+        printf("Please report as a bug at https://github.com/kxtzownsu/KVS\n");
+
+        sleep(86400);
+        return "Error!";
+    }
 	fclose(fp);
     trim_newline(output);
     
@@ -57,6 +71,7 @@ char* getKernver() {
     static char kernver_str[18] = "0x00000000";
 
     // ewwww yucky i hate this
+    // bitshift stuff sucks so bad when looking at it
 
     if (strncmp(output, "10", 2) == 0) {
         printf("using v1.0\n");
@@ -73,6 +88,7 @@ char* getKernver() {
         KERNVER_TYPE = "v0";
     }
 
+    KERNVER_TYPE = "v0";
     return kernver_str;
 }
 
@@ -93,12 +109,10 @@ const char* getFWMPFlags(){
     static char fwmp_str[5];
 
     if (num_parsed != 1) {
-        printf("Failed to parse FWMP value from output.\n");
+        return "Failed to parse FWMP value from output.";
-        return 0;
     }
 
     snprintf(fwmp_str, sizeof(fwmp_str), "0x%02x", fwmp);
-
     return fwmp_str;
 }
 
@@ -106,18 +120,33 @@ const char* getGSCRWVersion(){
     char cmd[] = "gsctool -a -f | tail -n 1 | awk '{printf $2}'";
     static char output[8];
     FILE* fp = popen(cmd, "r");
-    fgets(output, sizeof(output), fp);
+    if (fgets(output, sizeof(output), fp) == NULL) {
+        printf("Error reading GSC(cr50/ti50) version\n");
+        printf("Please report as a bug at https://github.com/kxtzownsu/KVS\n");
+
+        sleep(86400);
+        return "Error!";
+    }
 	fclose(fp);
     trim_newline(output);
 
     return output;
 }
 
+// this being at a pre-made directory instead of
+// being in PATH or /bin is probably bad, but
+// I don't really care that much
 const char* getGSCType(){
     char cmd[] = "/opt/kvs/bin/is_ti50 2>/dev/null";
     static char output[7];
     FILE* fp = popen(cmd, "r");
-    fgets(output, sizeof(output), fp);
+    if (fgets(output, sizeof(output), fp) == NULL) {
+        printf("Error getting GSC(cr50/ti50) type!\n");
+        printf("Please report as a bug at https://github.com/kxtzownsu/KVS\n");
+
+        sleep(86400);
+        return "Error!";
+    }
 	fclose(fp);
     trim_newline(output);
 

src/KVG/main.rs

@@ -100,7 +100,7 @@ fn main() {
             e.g.: {} 0x00010001 --raw\n\
             --raw - prints the output as raw hex bytes\n\
             --ver=<0/1> - specifies the kernver struct version to use\n\
-            --help - shows this message :3\n\
+            --help - shows this message\n\
             KVG was created by kxtzownsu\n\
             (now written in Rust)",
             args[0], args[0]

src/KVS/main.c

@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include "ui.h"
 #include "sysinfo.h"
+#include "arg_checks.h"
 
 void kernver_faq(){
 	printf(
@@ -18,10 +19,19 @@ void kernver_faq(){
 	);
 };
 
+void dbgprintf(char* text){
+	if (fbool("--debug","-d")){
+		printf("DEBUG: %s\n", text);
+	}
+}
+
 int main(int argc, char **argv) {
+	gargc = argc;
+	gargv = argv;
 	if (geteuid() !=  0){
 		printf("Please run KVS as root!\n");
-		exit(1);
+		printf("This is a bug, please report it at https://github.com/kxtzownsu/KVS");
+		sleep(86400);
 	}
 
 	const char* fwver = getFirmwareVersion();
@@ -33,6 +43,7 @@ int main(int argc, char **argv) {
 
 	// only allow 2 characters (option & newline)
 	char choice[3];
+	dbgprintf("ui loop \n");
 	while (true) {
 		char* kernver = getKernver();
 		

src/KVS/ui.c

@@ -24,48 +24,43 @@ void ui_flash(char* flashtype) {
 	printf("What kernver would you like to flash? \n");
 	printf("> ");
 	fgets(kerninput, sizeof(kerninput), stdin);
-	// nya
 	if (kerninput[strlen(kerninput) - 1] == '\n') {
         kerninput[strlen(kerninput) - 1] = '\0';
     }
 	if (!is_valid_hex(kerninput)){
-		fprintf(stderr, "Your kernver, %s, was an invalid input. Not hex.", kerninput);
+		fprintf(stderr, "Your kernver, %s, was an invalid input, not hex. A valid input would be: 0x00010001", kerninput);
 		exit(1);
-	}
+	} else {
+		// the output of strcmp if it fails is True
+		if (strcmp(KERNVER_TYPE, "v0") && strcmp(KERNVER_TYPE, "v1")){
+			// the reason we're not redirecting the user to the issues page is because if KERNVER_TYPE 
+			// isn't detected as v0 or v1 in sysinfo.h, it'll do that already
+			fprintf(stderr, "%s", KERNVER_TYPE);
+			sleep(86400);
+		}
 
-	// the output of strcmp if it fails is True
+		// we check if its *false* since strcmp returns true if failing
-	if (strcmp(KERNVER_TYPE, "v0") && strcmp(KERNVER_TYPE, "v1")){
+		if (!strcmp(KERNVER_TYPE, "v0")){ 
-		fprintf(stderr, KERNVER_TYPE);
+			char cmd[128];
-		exit(1);
-	}
 
-	// we check if its *false* since strcmp returns true if failing
+			snprintf(cmd, sizeof(cmd), "kvg %s --ver=0", kerninput);
-	if (!strcmp(KERNVER_TYPE, "v0")){ 
+    		FILE* fp = popen(cmd, "r");
-		char cmd[128];
+    		fgets(kvgout_v0, sizeof(kvgout_v0), fp);
+			fclose(fp);
+		} else if (!strcmp(KERNVER_TYPE, "v1")) {
+			char cmd[128];
 
-		snprintf(cmd, sizeof(cmd), "kvg %s --ver=0", kerninput);
+			snprintf(cmd, sizeof(cmd), "kvg %s --ver=1", kerninput);
-    	FILE* fp = popen(cmd, "r");
+    		FILE* fp = popen(cmd, "r");
-    	fgets(kvgout_v0, sizeof(kvgout_v0), fp);
+    		fgets(kvgout_v1, sizeof(kvgout_v1), fp);
-		fclose(fp);
+			fclose(fp);
-	} else if (!strcmp(KERNVER_TYPE, "v1")) {
+		}
-		char cmd[128];
-
-		snprintf(cmd, sizeof(cmd), "kvg %s --ver=1", kerninput);
-    	FILE* fp = popen(cmd, "r");
-    	fgets(kvgout_v1, sizeof(kvgout_v1), fp);
-		fclose(fp);
-	}
 	
-
-	if (flashtype == "tpm0"){
 		if (!strcmp(KERNVER_TYPE, "v0")) {
 			tpm_nvwrite("0x1008", kvgout_v0);
-
 		} else if (!strcmp(KERNVER_TYPE, "v1")) {
 			tpm_nvwrite("0x1008", kvgout_v1);
 		}
-	} else if (flashtype == "rmasmoke"){
-		printf("using rmasmoke\n");
 	}
 }
 
@@ -83,6 +78,7 @@ void ui_header(const char* fwver, char* kernver, const char* tpmver, const char*
 void show_credits(){
 	printf("kxtzownsu - Writing KVS 1 and 2\n");
 	printf("Hannah/ZegLol - writing is_ti50, mental support, testing\n");
+	printf("Darkn - testing\n");
 }
 
 void troll(){

website/index.html

@@ -55,7 +55,7 @@
         <h3>Credits</h3>
         <p><b>kxtzownsu</b> - Writing KVS</p>
         <p><b>OlyB</b> - Helping me with the shim builder, most of the shim builder wouldn't exist without him.</p>
-        <p><b>Google</b> - Writing the <code>tpmc</code> command :3</p>
+        <p><b>Google</b> - Writing the <code>tpmc</code> command</p>
       </div>
       <div style="padding-bottom: 3%;"></div>
     </div>