[GTK][WPE] CGroupMemoryController::getCgroupFileValue not stack if not numerical value is scanned from the file input (e.g: max) #28337

psaavedra · 2024-05-09T12:33:41Z

`a5f69d0`

[GTK][WPE] CGroupMemoryController::getCgroupFileValue not stack if not numerical value is scanned from the file input (e.g: max)
https://bugs.webkit.org/show_bug.cgi?id=273931

Reviewed by Carlos Alberto Lopez Perez.

Improves the CGroupMemoryController::getCgroupFileValue by ensuring it
handles non-numeric values (e.g., max).

Fixes TestNetworkProcessMemoryPressure API test (webkit.org/b/263016).

* Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp:
(WebKit::CGroupMemoryController::getCgroupFileValue):
* Tools/TestWebKitAPI/glib/TestExpectations.json:

Canonical link: https://commits.webkit.org/278599@main

f8e9b61

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-skia
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-05-09T12:39:56Z

EWS run on previous version of this PR (hash 454075d)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	❌ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~		❌ 🛠 wpe-skia
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🛠 gtk~~
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	~~🧪 gtk-wk2~~
	✅ 🛠 tv-sim	~~🧪 mac-wk2-stress~~	~~🧪 api-gtk~~
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-05-09T12:45:34Z

EWS run on previous version of this PR (hash f94a266)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt		✅ 🛠 wpe-skia
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	❌ 🧪 api-gtk
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-05-09T14:50:28Z

EWS run on previous version of this PR (hash 65ed88a)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-skia
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🛠 watch
	✅ 🛠 watch-sim

clopez · 2024-05-09T16:17:58Z

Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp

+    int res = fscanf(file, "%" STRINGIFY(VALUE_BUFFER_SIZE) "[^\n]", rawValue);
+
+    if (res < 1)


the variable res is not really needed, we can check the return code from fscanf in the if() ifself

valid point. PR just updated according with this suggestion.

webkit-early-warning-system · 2024-05-09T19:17:59Z

EWS run on current version of this PR (hash f8e9b61)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-skia
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-ews-buildbot · 2024-05-09T23:30:39Z

Safe-Merge-Queue: Build #20331.

webkit-ews-buildbot · 2024-05-10T05:00:38Z

Safe-Merge-Queue: Build #20353.

…t numerical value is scanned from the file input (e.g: max) https://bugs.webkit.org/show_bug.cgi?id=273931 Reviewed by Carlos Alberto Lopez Perez. Improves the CGroupMemoryController::getCgroupFileValue by ensuring it handles non-numeric values (e.g., max). Fixes TestNetworkProcessMemoryPressure API test (webkit.org/b/263016). * Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp: (WebKit::CGroupMemoryController::getCgroupFileValue): * Tools/TestWebKitAPI/glib/TestExpectations.json: Canonical link: https://commits.webkit.org/278599@main

webkit-commit-queue · 2024-05-10T05:11:17Z

Committed 278599@main (a5f69d0): https://commits.webkit.org/278599@main

Reviewed commits have been landed. Closing PR #28337 and removing active labels.

aperezdc · 2024-05-10T12:15:38Z

Backported into the 2.44 branch as commit 4f68fd3

psaavedra requested a review from a team as a code owner May 9, 2024 12:33

psaavedra self-assigned this May 9, 2024

psaavedra added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label May 9, 2024

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 9, 2024

psaavedra removed the merging-blocked Applied to prevent a change from being merged label May 9, 2024

psaavedra force-pushed the eng/CGroupMemoryControllergetCgroupFileValue-not-stack-if-not-numerical-value-is-scanned-from-the-file-input-e-g-max branch from 454075d to f94a266 Compare May 9, 2024 12:42

psaavedra force-pushed the eng/CGroupMemoryControllergetCgroupFileValue-not-stack-if-not-numerical-value-is-scanned-from-the-file-input-e-g-max branch from f94a266 to 65ed88a Compare May 9, 2024 14:49

clopez approved these changes May 9, 2024

View reviewed changes

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 9, 2024

psaavedra removed the merging-blocked Applied to prevent a change from being merged label May 9, 2024

psaavedra force-pushed the eng/CGroupMemoryControllergetCgroupFileValue-not-stack-if-not-numerical-value-is-scanned-from-the-file-input-e-g-max branch from 65ed88a to f8e9b61 Compare May 9, 2024 19:15

psaavedra added the merge-queue Applied to send a pull request to merge-queue label May 9, 2024

webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels May 9, 2024

psaavedra added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label May 9, 2024

webkit-ews-buildbot added merge-queue Applied to send a pull request to merge-queue and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels May 9, 2024

psaavedra added safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks and removed merging-blocked Applied to prevent a change from being merged merge-queue Applied to send a pull request to merge-queue labels May 10, 2024

webkit-ews-buildbot removed the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label May 10, 2024

webkit-ews-buildbot added the merge-queue Applied to send a pull request to merge-queue label May 10, 2024

webkit-commit-queue force-pushed the eng/CGroupMemoryControllergetCgroupFileValue-not-stack-if-not-numerical-value-is-scanned-from-the-file-input-e-g-max branch from f8e9b61 to a5f69d0 Compare May 10, 2024 05:11

webkit-commit-queue merged commit a5f69d0 into WebKit:main May 10, 2024

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 10, 2024

psaavedra added the GLib Suggested Backport Suggest this merge request be backported to current WPE/GTK stable branch label May 10, 2024

aperezdc removed the GLib Suggested Backport Suggest this merge request be backported to current WPE/GTK stable branch label May 10, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[GTK][WPE] CGroupMemoryController::getCgroupFileValue not stack if not numerical value is scanned from the file input (e.g: max) #28337

[GTK][WPE] CGroupMemoryController::getCgroupFileValue not stack if not numerical value is scanned from the file input (e.g: max) #28337

psaavedra commented May 9, 2024 •

edited by webkit-early-warning-system

webkit-early-warning-system commented May 9, 2024 •

edited

webkit-early-warning-system commented May 9, 2024 •

edited

webkit-early-warning-system commented May 9, 2024 •

edited

clopez May 9, 2024

psaavedra May 9, 2024

webkit-early-warning-system commented May 9, 2024 •

edited

webkit-ews-buildbot commented May 9, 2024

webkit-ews-buildbot commented May 10, 2024

webkit-commit-queue commented May 10, 2024

aperezdc commented May 10, 2024 •

edited

		int res = fscanf(file, "%" STRINGIFY(VALUE_BUFFER_SIZE) "[^\n]", rawValue);

		if (res < 1)

[GTK][WPE] CGroupMemoryController::getCgroupFileValue not stack if not numerical value is scanned from the file input (e.g: max) #28337

[GTK][WPE] CGroupMemoryController::getCgroupFileValue not stack if not numerical value is scanned from the file input (e.g: max) #28337

Conversation

psaavedra commented May 9, 2024 • edited by webkit-early-warning-system

a5f69d0

webkit-early-warning-system commented May 9, 2024 • edited

webkit-early-warning-system commented May 9, 2024 • edited

webkit-early-warning-system commented May 9, 2024 • edited

clopez May 9, 2024

Choose a reason for hiding this comment

psaavedra May 9, 2024

Choose a reason for hiding this comment

webkit-early-warning-system commented May 9, 2024 • edited

webkit-ews-buildbot commented May 9, 2024

webkit-ews-buildbot commented May 10, 2024

webkit-commit-queue commented May 10, 2024

aperezdc commented May 10, 2024 • edited

psaavedra commented May 9, 2024 •

edited by webkit-early-warning-system

`a5f69d0`

webkit-early-warning-system commented May 9, 2024 •

edited

webkit-early-warning-system commented May 9, 2024 •

edited

webkit-early-warning-system commented May 9, 2024 •

edited

webkit-early-warning-system commented May 9, 2024 •

edited

aperezdc commented May 10, 2024 •

edited