933998 - certDER can leak in nsNSSCertificateDB::ConstructX509FromBase64

Status: RESOLVED FIXED

(Core :: Security: PSM, defect)

Description

[Dana Keeler (she/her) (use needinfo) (:keeler for reviews)]

This only happens if NSS is already shut down, but still.

1386 NS_IMETHODIMP
1387 nsNSSCertificateDB::ConstructX509FromBase64(const char *base64,
1388                                             nsIX509Cert **_retval)
1389 {
1390   NS_ENSURE_ARG_POINTER(_retval);
1391 
1392   // sure would be nice to have a smart pointer class for PL_ allocations
1393   // unfortunately, we cannot distinguish out-of-memory from bad-input here
1394   uint32_t len = base64 ? strlen(base64) : 0;
1395   char *certDER = PL_Base64Decode(base64, len, nullptr);
...
1402 
1403   // If we get to this point, we know we had well-formed base64 input;
...
1413   nsNSSShutDownPreventionLock locker;
1414   if (isAlreadyShutDown()) {
1415     return NS_ERROR_NOT_AVAILABLE;
1416   }

We should just hoist the shutdown check to the top of the function.

Comment 1

[Michael]

Attachment: Patch

Comment 2

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/85caaabac21b

Comment 3

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/85caaabac21b