diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch')
-rw-r--r-- | poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch | 119 |
1 files changed, 0 insertions, 119 deletions
diff --git a/poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch b/poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch deleted file mode 100644 index bc10f3385..000000000 --- a/poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 6f7d7be9997ba6727a5ad7c3800df9051160dc12 Mon Sep 17 00:00:00 2001 -From: Martin Thomson <martin.thomson@gmail.com> -Date: Tue, 13 Feb 2018 12:30:58 +1100 -Subject: [PATCH] Bug 1437734 - Use snprintf in sign.c, r=ttaubert - ---HG-- -extra : rebase_source : 97921ece71ff86b18d32b891591608290eed4d83 ---- -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport [https://github.com/nss-dev/nss/commit/0a9078b3cde97add7c825c9d13467a8401ad0c88#diff-b42512151dc137537091f823f7701804.patch] - - nss/cmd/signtool/sign.c | 58 ++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 48 insertions(+), 10 deletions(-) - -diff --git a/nss/cmd/signtool/sign.c b/nss/cmd/signtool/sign.c -index 6e776069a..6f8e43946 100644 ---- a/nss/cmd/signtool/sign.c -+++ b/nss/cmd/signtool/sign.c -@@ -43,6 +43,7 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, - int status; - char tempfn[FNSIZE], fullfn[FNSIZE]; - int keyType = rsaKey; -+ int count; - - metafile = meta_file; - optimize = _optimize; -@@ -81,9 +82,18 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, - } - - /* rsa/dsa to zip */ -- sprintf(tempfn, "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" -- : "rsa")); -- sprintf(fullfn, "%s/%s", tree, tempfn); -+ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" : "rsa")); -+ if (count >= sizeof(tempfn)) { -+ PR_fprintf(errorFD, "unable to write key metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } -+ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); -+ if (count >= sizeof(fullfn)) { -+ PR_fprintf(errorFD, "unable to write key metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } - JzipAdd(fullfn, tempfn, zipfile, compression_level); - - /* Loop through all files & subdirectories, add to archive */ -@@ -93,20 +103,44 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, - } - /* mf to zip */ - strcpy(tempfn, "META-INF/manifest.mf"); -- sprintf(fullfn, "%s/%s", tree, tempfn); -+ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); -+ if (count >= sizeof(fullfn)) { -+ PR_fprintf(errorFD, "unable to write manifest\n"); -+ errorCount++; -+ exit(ERRX); -+ } - JzipAdd(fullfn, tempfn, zipfile, compression_level); - - /* sf to zip */ -- sprintf(tempfn, "META-INF/%s.sf", base); -- sprintf(fullfn, "%s/%s", tree, tempfn); -+ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.sf", base); -+ if (count >= sizeof(tempfn)) { -+ PR_fprintf(errorFD, "unable to write sf metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } -+ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); -+ if (count >= sizeof(fullfn)) { -+ PR_fprintf(errorFD, "unable to write sf metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } - JzipAdd(fullfn, tempfn, zipfile, compression_level); - - /* Add the rsa/dsa file to the zip archive normally */ - if (!xpi_arc) { - /* rsa/dsa to zip */ -- sprintf(tempfn, "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" -- : "rsa")); -- sprintf(fullfn, "%s/%s", tree, tempfn); -+ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" : "rsa")); -+ if (count >= sizeof(tempfn)) { -+ PR_fprintf(errorFD, "unable to write key metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } -+ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); -+ if (count >= sizeof(fullfn)) { -+ PR_fprintf(errorFD, "unable to write key metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } - JzipAdd(fullfn, tempfn, zipfile, compression_level); - } - -@@ -408,6 +442,7 @@ static int - manifesto_xpi_fn(char *relpath, char *basedir, char *reldir, char *filename, void *arg) - { - char fullname[FNSIZE]; -+ int count; - - if (verbosity >= 0) { - PR_fprintf(outputFD, "--> %s\n", relpath); -@@ -421,7 +456,10 @@ manifesto_xpi_fn(char *relpath, char *basedir, char *reldir, char *filename, voi - if (!PL_HashTableLookup(extensions, ext)) - return 0; - } -- sprintf(fullname, "%s/%s", basedir, relpath); -+ count = snprintf(fullname, sizeof(fullname), "%s/%s", basedir, relpath); -+ if (count >= sizeof(fullname)) { -+ return 1; -+ } - JzipAdd(fullname, relpath, zipfile, compression_level); - - return 0; |