From 5cdc2a329d7f32814f1ed07857b1fa3f6bbe1dda Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sun, 19 Nov 2017 12:22:51 -0500
Subject: driver: properly implement --libpath as an exclusive choice.

---
 src/driver/mdso_driver_ctx.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/driver/mdso_driver_ctx.c b/src/driver/mdso_driver_ctx.c
index 9803391..ef08600 100644
--- a/src/driver/mdso_driver_ctx.c
+++ b/src/driver/mdso_driver_ctx.c
@@ -20,6 +20,10 @@
 #include "mdso_driver_impl.h"
 #include "argv/argv.h"
 
+#define MDSO_LOADER_FLAGS_MASK	(MDSO_FLAG_LOADER_PATH \
+				| MDSO_FLAG_PEB_PATH   \
+				| MDSO_FLAG_SYSTEM32)
+
 /* package info */
 static const struct mdso_source_version mdso_src_version = {
 	MDSO_TAG_VER_MAJOR,
@@ -226,6 +230,8 @@ int mdso_get_driver_ctx(
 					break;
 
 				case TAG_LIBPATH:
+					cctx.dsoflags &= ~(uint64_t)MDSO_LOADER_FLAGS_MASK;
+
 					if (!(strcmp(entry->arg,"loader")))
 						cctx.dsoflags |= MDSO_FLAG_LOADER_PATH;
 					if (!(strcmp(entry->arg,"peb")))
-- 
cgit v1.2.3