diff options
| -rw-r--r-- | meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-5605.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-support/nss/nss.inc | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-5605.patch b/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-5605.patch new file mode 100644 index 0000000000..7203d02c78 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-5605.patch @@ -0,0 +1,18 @@ +signed-off-by: Ryan Sleevi <ryan.sleevi@gmail.com> +Upstream-Status: Backport +reference:https://hg.mozilla.org/projects/nss/rev/e79a09364b5e + +--- a/nss/lib/ssl/ssl3con.c ++++ b/nss/lib/ssl/ssl3con.c +@@ -781,6 +781,11 @@ static SECStatus + Null_Cipher(void *ctx, unsigned char *output, int *outputLen, int maxOutputLen, + const unsigned char *input, int inputLen) + { ++ if (inputLen > maxOutputLen) { ++ *outputLen = 0; /* Match PK11_CipherOp in setting outputLen */ ++ PORT_SetError(SEC_ERROR_OUTPUT_LEN); ++ return SECFailure; ++ } + *outputLen = inputLen; + if (input != output) + PORT_Memcpy(output, input, inputLen); diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index 6364562a13..404deccd8a 100644 --- a/meta/recipes-support/nss/nss.inc +++ b/meta/recipes-support/nss/nss.inc @@ -17,6 +17,7 @@ SRC_URI = "\ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ file://nss-3.15.1-fix-CVE-2013-1741.patch \ + file://nss-3.15.1-fix-CVE-2013-5605.patch \ " SRC_URI_append_class-target = "\ file://nss.pc.in \ |