Extern: Update TinyGLTF to include fix for CVE-2022-3008 #105536

Merged
Julian Eisel merged 1 commits from Julian-Squires/blender:update-tinygltf into blender-v3.5-release 2023-03-10 14:56:46 +01:00
Contributor

The use of wordexp(3) permits arbitrary code execution from
manually-crafted glTF files. See
https://github.com/syoyo/tinygltf/issues/368
for more details.

Note that the warning that required the local modification is no
longer present upstream since
0bfcb4f49e

The use of wordexp(3) permits arbitrary code execution from manually-crafted glTF files. See https://github.com/syoyo/tinygltf/issues/368 for more details. Note that the warning that required the local modification is no longer present upstream since https://github.com/syoyo/tinygltf/commit/0bfcb4f49e0b149c41ba67eeb3b64f297c1637f5
Julian Squires force-pushed update-tinygltf from db9668604e to ba4514f8f2 2023-03-07 17:57:12 +01:00 Compare
Julian Squires requested review from Julian Eisel 2023-03-07 18:00:36 +01:00

If this is a security fix it should target 3.5 (and get backported to LTS after):
https://wiki.blender.org/wiki/Tools/Pull_Requests#Rebasing_a_Pull_Request

However from what I understand we only use tinygltf for data coming the OpenXR driver, so there may be no security issue for Blender in practice as the driver can already execute arbitrary code. If so it's not strictly needed to have it in 3.5 or LTS, though maybe there are other reasons why it helps to upgrade those versions.

If this is a security fix it should target 3.5 (and get backported to LTS after): https://wiki.blender.org/wiki/Tools/Pull_Requests#Rebasing_a_Pull_Request However from what I understand we only use tinygltf for data coming the OpenXR driver, so there may be no security issue for Blender in practice as the driver can already execute arbitrary code. If so it's not strictly needed to have it in 3.5 or LTS, though maybe there are other reasons why it helps to upgrade those versions.
Author
Contributor

If this is a security fix it should target 3.5 (and get backported to LTS after):
https://wiki.blender.org/wiki/Tools/Pull_Requests#Rebasing_a_Pull_Request

However from what I understand we only use tinygltf for data coming the OpenXR driver, so there may be no security issue for Blender in practice as the driver can already execute arbitrary code. If so it's not strictly needed to have it in 3.5 or LTS, though maybe there are other reasons why it helps to upgrade those versions.

I was hoping someone more familiar with the OpenXR code would assess whether it constitutes a vulnerability worthy of backporting. I apologize that this is a bit of a drive-by; I noticed this only because I was surveying the use of wordexp in applications on my system, and it wasn't clear to me whether it was possible for a user to open glTF files that might have been supplied from an untrusted source or not -- I don't know where the controller models come from. Clearly it's worth fixing anyway, so no one else decides to use the broken version for a broader purpose.

Let me know if you'd like me to target this against a different branch.

> If this is a security fix it should target 3.5 (and get backported to LTS after): > https://wiki.blender.org/wiki/Tools/Pull_Requests#Rebasing_a_Pull_Request > > However from what I understand we only use tinygltf for data coming the OpenXR driver, so there may be no security issue for Blender in practice as the driver can already execute arbitrary code. If so it's not strictly needed to have it in 3.5 or LTS, though maybe there are other reasons why it helps to upgrade those versions. I was hoping someone more familiar with the OpenXR code would assess whether it constitutes a vulnerability worthy of backporting. I apologize that this is a bit of a drive-by; I noticed this only because I was surveying the use of wordexp in applications on my system, and it wasn't clear to me whether it was possible for a user to open glTF files that might have been supplied from an untrusted source or not -- I don't know where the controller models come from. Clearly it's worth fixing anyway, so no one else decides to use the broken version for a broader purpose. Let me know if you'd like me to target this against a different branch.

I think we might as well target this at 3.5 and backport to LTS. But will leave final decision to @JulianEisel.

I think we might as well target this at 3.5 and backport to LTS. But will leave final decision to @JulianEisel.
Member

If this is easy for platform maintainers to update for 3.5, I'm fine with it. Don't have a strong opinion though.

Indeed, we just use TinyGLTF to get the controller geometry from the OpenXR runtime which is installed on the system (like a driver).

If this is easy for platform maintainers to update for 3.5, I'm fine with it. Don't have a strong opinion though. Indeed, we just use TinyGLTF to get the controller geometry from the OpenXR runtime which is installed on the system (like a driver).

It's in extern, there is no work for platform maintainers. Doesn't hurt to check on the buildbot though.

@blender-bot build

It's in extern, there is no work for platform maintainers. Doesn't hurt to check on the buildbot though. @blender-bot build
Julian Eisel approved these changes 2023-03-09 16:50:01 +01:00
Julian Eisel left a comment
Member

A Linux PLY test is failing but that should be unrelated.

PR looks good to me.

A Linux PLY test is failing but that should be unrelated. PR looks good to me.
Member

@Julian-Squires could you rebase the PR onto the blender-v3.5-release branch?

@Julian-Squires could you rebase the PR onto the `blender-v3.5-release` branch?
Julian-Squires changed target branch from main to blender-v3.5-release 2023-03-10 13:19:57 +01:00
Julian Squires force-pushed update-tinygltf from ba4514f8f2 to ae41959f26 2023-03-10 13:20:24 +01:00 Compare
Julian Squires force-pushed update-tinygltf from ae41959f26 to ae8523376e 2023-03-10 13:22:38 +01:00 Compare
Author
Contributor

Thanks for the review. Targeted against blender-v3.5-release instead.

Thanks for the review. Targeted against `blender-v3.5-release` instead.
Julian Eisel merged commit 466eb426ed into blender-v3.5-release 2023-03-10 14:56:46 +01:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#105536
No description provided.