mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 05:49:57 +00:00
Code Issues Projects Releases Wiki Activity

nss: backport fix for native build failure due to dangling pointer with gcc13

Browse Source 
Upstream-Status: Backport
Link: https://github.com/nss-dev/nss/commit/cbf5a2bce75ca2c2fd3e247796b9892f5298584e

Signed-off-by: Jack Mitchell <ml@embed.me.uk>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Jack Mitchell
2023-05-10 10:06:48 +01:00
committed by Armin Kuster
parent c69846bfc6
commit 4c533a5f90
2 changed files with 76 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/nss/nss/0001-Bug-1826650-cmd-ecperf-fix-dangling-pointer-warning-.patch
+75
View File
@@ -0,0 +1,75 @@
From cbf5a2bce75ca2c2fd3e247796b9892f5298584e Mon Sep 17 00:00:00 2001
From: "John M. Schanck" <jschanck@mozilla.com>
Date: Thu, 13 Apr 2023 17:43:46 +0000
Subject: [PATCH] Bug 1826650 - cmd/ecperf: fix dangling pointer warning on gcc
13. r=djackson
Differential Revision: https://phabricator.services.mozilla.com/D174822
--HG--
extra : moz-landing-system : lando
---
cmd/ecperf/ecperf.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/cmd/ecperf/ecperf.c b/cmd/ecperf/ecperf.c
index 705d68f35..a07004d8e 100644
--- a/cmd/ecperf/ecperf.c
+++ b/cmd/ecperf/ecperf.c
@@ -53,6 +53,7 @@ PKCS11Thread(void *data)
SECItem sig;
CK_SESSION_HANDLE session;
CK_RV crv;
+ void *tmp = NULL;
threadData->status = SECSuccess;
threadData->count = 0;
@@ -68,6 +69,7 @@ PKCS11Thread(void *data)
if (threadData->isSign) {
sig.data = sigData;
sig.len = sizeof(sigData);
+ tmp = threadData->p2;
threadData->p2 = (void *)&sig;
}
@@ -79,6 +81,10 @@ PKCS11Thread(void *data)
}
threadData->count++;
}
+
+ if (threadData->isSign) {
+ threadData->p2 = tmp;
+ }
return;
}
@@ -89,6 +95,7 @@ genericThread(void *data)
int iters = threadData->iters;
unsigned char sigData[256];
SECItem sig;
+ void *tmp = NULL;
threadData->status = SECSuccess;
threadData->count = 0;
@@ -96,6 +103,7 @@ genericThread(void *data)
if (threadData->isSign) {
sig.data = sigData;
sig.len = sizeof(sigData);
+ tmp = threadData->p2;
threadData->p2 = (void *)&sig;
}
@@ -107,6 +115,10 @@ genericThread(void *data)
}
threadData->count++;
}
+
+ if (threadData->isSign) {
+ threadData->p2 = tmp;
+ }
return;
}
--
2.40.1
meta-oe/recipes-support/nss/nss_3.51.1.bb
+1
View File
@@ -44,6 +44,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://CVE-2022-22747.patch \
file://CVE-2023-0767.patch \
file://0001-Bug-1812671-build-failure-while-implicitly-casting-S.patch;patchdir=nss \
file://0001-Bug-1826650-cmd-ecperf-fix-dangling-pointer-warning-.patch;patchdir=nss \
"
SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233"