Skip to content

Fix for CVE-2025-6338#13

Merged
jpek42 merged 2 commits intoautodesk-forks:adsk-contrib/gec/6.8.3from
dangelog:CVE-2025-6338
Jan 27, 2026
Merged

Fix for CVE-2025-6338#13
jpek42 merged 2 commits intoautodesk-forks:adsk-contrib/gec/6.8.3from
dangelog:CVE-2025-6338

Conversation

@dangelog
Copy link

@dangelog dangelog commented Jan 22, 2026

These commits implement the fix for CVE-2025-6338 .

The first is is just some code tidies done in preparation for the actual fix (use a smart pointer instead of a raw pointer).
The second is the actual fix. The code in there depends on the usage of the smart pointer.

In order avoid any refactoring around security-sensitive code, I've picked them both.

We already have the alias for it, we just never updated the stored
member to use it.

(cherry picked from commit f9fbdba)
The key/certificate lifetime management in our Schannel backend is a
little lacking. We haven't guaranteed that the original contexts are
held alive for the full duration of their usage. Though with default
settings they get persisted to disk so it has been mostly fine.

One problem with that is that the legacy APIs in Windows for this is not
smart enough to figure out that a repeatedly-loaded key is the same one,
so it 'persists' a new file to disk every time we set up a credential
context for a connection. For a busy server this may end up with
creating a ton of small files that don't get deleted (or reused).

By using the ncrypt APIs we don't fully stop persisting _all_ data to
disk, but from testing we now only have one file per key. Regardless of
the amount of connections.

Another patch around lifetimes can be done for dev, and dev only, as
it's quite a bit more extensive, and not fit for picking back to the
LTS branches.

Fixes: QTBUG-136055
Fixes: CVE-2025-6338
(cherry picked from commit 94f0ff7)
Copy link

@MattPooleyADSK MattPooleyADSK left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes match the relevant updates in LGPL Qt 6.9.2 and address the reported CVE

@jpek42 jpek42 merged commit 3159571 into autodesk-forks:adsk-contrib/gec/6.8.3 Jan 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants