Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-02-02 03:06:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed unaligned memory read in DMI

Browse source
This commit is contained in:
SChernykh 2022-05-19 20:56:19 +02:00
parent c877ba8145
commit 285719cde4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/base/tools/Alignment.h
View file

@ -30,7 +30,7 @@ namespace xmrig {
template<typename T> template<typename T>
inline T readUnaligned(const T* ptr) inline T readUnaligned(const T* ptr)
{ {
static_assert(std::is_integral<T>::value, "Integer type required"); static_assert(std::is_trivially_copyable<T>::value, "T must be trivially copyable");
T result; T result;
memcpy(&result, ptr, sizeof(T)); memcpy(&result, ptr, sizeof(T));
@ -41,7 +41,7 @@ inline T readUnaligned(const T* ptr)
template<typename T> template<typename T>
inline void writeUnaligned(T* ptr, T data) inline void writeUnaligned(T* ptr, T data)
{ {
static_assert(std::is_integral<T>::value, "Integer type required"); static_assert(std::is_trivially_copyable<T>::value, "T must be trivially copyable");
memcpy(ptr, &data, sizeof(T)); memcpy(ptr, &data, sizeof(T));
} }

3
src/crypto/randomx/jit_compiler_fallback.cpp
View file

@ -28,13 +28,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#pragma once
void randomx_set_huge_pages_jit(bool) void randomx_set_huge_pages_jit(bool)
{ {
} }
void randomx_set_optimized_dataset_init(int) void randomx_set_optimized_dataset_init(int)
{ {
} }

5
src/hw/dmi/DmiTools.h
View file

@ -24,6 +24,7 @@
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include "base/tools/Alignment.h"
namespace xmrig { namespace xmrig {
@ -45,10 +46,10 @@ struct u64 {
template<typename T> template<typename T>
inline T dmi_get(const uint8_t *data) { return *reinterpret_cast<const T *>(data); } inline T dmi_get(const uint8_t *data) { return readUnaligned(reinterpret_cast<const T *>(data)); }
template<typename T> template<typename T>
inline T dmi_get(const dmi_header *h, size_t offset) { return *reinterpret_cast<const T *>(h->data + offset); } inline T dmi_get(const dmi_header *h, size_t offset) { return readUnaligned(reinterpret_cast<const T *>(h->data + offset)); }
const char *dmi_string(dmi_header *dm, size_t offset); const char *dmi_string(dmi_header *dm, size_t offset);