v2.9.2

Fixed crash in patchCode() on Linux

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.9.2
+- [#907](https://github.com/xmrig/xmrig/pull/907) Fixed crash on Linux.
+
+# v2.9.1
+- Restored compatibility with https://stellite.hashvault.pro.
+
 # v2.9.0
 - [#899](https://github.com/xmrig/xmrig/issues/899) Added support for new algorithm `cn/half` for Masari and Stellite forks.
 - [#834](https://github.com/xmrig/xmrig/pull/834) Added ASM optimized code for AMD Bulldozer.

src/common/net/Client.cpp

@@ -342,7 +342,8 @@ bool Client::parseJob(const rapidjson::Value &params, int *code)
     if (params.HasMember("algo")) {
         job.setAlgorithm(params["algo"].GetString());
     }
-    else if (params.HasMember("variant")) {
+
+    if (params.HasMember("variant")) {
         const rapidjson::Value &variant = params["variant"];
 
         if (variant.IsInt()) {

src/crypto/asm/cn_main_loop.S

@@ -23,10 +23,7 @@ FN_PREFIX(cnv2_mainloop_ivybridge_asm):
 	#include "cn2/cnv2_main_loop_ivybridge.inc"
 	add rsp, 48
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 
 ALIGN(64)
 FN_PREFIX(cnv2_mainloop_ryzen_asm):
@@ -35,10 +32,7 @@ FN_PREFIX(cnv2_mainloop_ryzen_asm):
 	#include "cn2/cnv2_main_loop_ryzen.inc"
 	add rsp, 48
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 
 ALIGN(64)
 FN_PREFIX(cnv2_mainloop_bulldozer_asm):
@@ -47,10 +41,7 @@ FN_PREFIX(cnv2_mainloop_bulldozer_asm):
 	#include "cn2/cnv2_main_loop_bulldozer.inc"
 	add rsp, 48
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 
 ALIGN(64)
 FN_PREFIX(cnv2_double_mainloop_sandybridge_asm):
@@ -60,7 +51,4 @@ FN_PREFIX(cnv2_double_mainloop_sandybridge_asm):
 	#include "cn2/cnv2_double_main_loop_sandybridge.inc"
 	add rsp, 48
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054

src/crypto/asm/cn_main_loop.asm

@@ -8,40 +8,28 @@ ALIGN(64)
 cnv2_mainloop_ivybridge_asm PROC
 	INCLUDE cn2/cnv2_main_loop_ivybridge.inc
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 cnv2_mainloop_ivybridge_asm ENDP
 
 ALIGN(64)
 cnv2_mainloop_ryzen_asm PROC
 	INCLUDE cn2/cnv2_main_loop_ryzen.inc
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 cnv2_mainloop_ryzen_asm ENDP
 
 ALIGN(64)
 cnv2_mainloop_bulldozer_asm PROC
 	INCLUDE cn2/cnv2_main_loop_bulldozer.inc
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 cnv2_mainloop_bulldozer_asm ENDP
 
 ALIGN(64)
 cnv2_double_mainloop_sandybridge_asm PROC
 	INCLUDE cn2/cnv2_double_main_loop_sandybridge.inc
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 cnv2_double_mainloop_sandybridge_asm ENDP
 
 _TEXT_CNV2_MAINLOOP ENDS

src/crypto/asm/win64/cn_main_loop.S

@@ -10,34 +10,22 @@ ALIGN(64)
 cnv2_mainloop_ivybridge_asm:
 	#include "../cn2/cnv2_main_loop_ivybridge.inc"
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 
 ALIGN(64)
 cnv2_mainloop_ryzen_asm:
 	#include "../cn2/cnv2_main_loop_ryzen.inc"
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 
 ALIGN(64)
 cnv2_mainloop_bulldozer_asm:
 	#include "../cn2/cnv2_main_loop_bulldozer.inc"
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 
 ALIGN(64)
 cnv2_double_mainloop_sandybridge_asm:
 	#include "../cn2/cnv2_double_main_loop_sandybridge.inc"
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054

src/crypto/asm/win64/cn_main_loop.asm

@@ -8,40 +8,28 @@ ALIGN 64
 cnv2_mainloop_ivybridge_asm PROC
 	INCLUDE cn2/cnv2_main_loop_ivybridge.inc
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 cnv2_mainloop_ivybridge_asm ENDP
 
 ALIGN 64
 cnv2_mainloop_ryzen_asm PROC
 	INCLUDE cn2/cnv2_main_loop_ryzen.inc
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 cnv2_mainloop_ryzen_asm ENDP
 
 ALIGN 64
 cnv2_mainloop_bulldozer_asm PROC
 	INCLUDE cn2/cnv2_main_loop_bulldozer.inc
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 cnv2_mainloop_bulldozer_asm ENDP
 
 ALIGN 64
 cnv2_double_mainloop_sandybridge_asm PROC
 	INCLUDE cn2/cnv2_double_main_loop_sandybridge.inc
 	ret 0
-	nop
-	nop
-	nop
-	nop
+	mov eax, 3735929054
 cnv2_double_mainloop_sandybridge_asm ENDP
 
 _TEXT_CNV2_MAINLOOP ENDS

src/version.h

@@ -28,7 +28,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig CPU miner"
-#define APP_VERSION   "2.9.0"
+#define APP_VERSION   "2.9.2"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
@@ -36,7 +36,7 @@
 
 #define APP_VER_MAJOR  2
 #define APP_VER_MINOR  9
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  2
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1910)

src/workers/CpuThread.cpp

@@ -69,9 +69,10 @@ static void patchCode(T dst, U src, const uint32_t iterations, const uint32_t ma
 #   endif
 
     size_t size = 0;
-    while (*(uint32_t*)(p + size) != 0x90909090) {
+    while (*(uint32_t*)(p + size) != 0xDEADC0DE) {
         ++size;
     }
+    size += sizeof(uint32_t);
 
     memcpy((void*) dst, (const void*) src, size);