Skip to content

Check for open_basedir before reading /proc #37959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szaimen merged 2 commits into from
Nov 15, 2023
Merged

Check for open_basedir before reading /proc #37959

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53b8473
Check for open_basedir before reading /proc
solracsf Apr 27, 2023
ef5f7d0
Us strpos() only
solracsf Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Us strpos() only 
Signed-off-by: Git'Fellow <[email protected]>
  • Loading branch information
@solracsf
solracsf committed Nov 14, 2023
commit ef5f7d0a907a2864d39272f1b82b608fc0ef45fb
12 changes: 3 additions & 9 deletions lib/private/Preview/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,20 +257,14 @@ public static function unguardWithSemaphore(false|\SysvSemaphore $semId): bool {
*/
public static function getHardwareConcurrency(): int {
static $width;

if (!isset($width)) {
if (function_exists('ini_get')) {
$openBasedir = ini_get('open_basedir');
if ($openBasedir == '') {
if (empty($openBasedir) || strpos($openBasedir, '/proc/cpuinfo') !== false) {
$width = is_readable('/proc/cpuinfo') ? substr_count(file_get_contents('/proc/cpuinfo'), 'processor') : 0;
} else {
$openBasedirPaths = explode(':', $openBasedir);
foreach ($openBasedirPaths as $path) {
if (strpos($path, '/proc') === 0 || $path === '/proc/cpuinfo') {
$width = is_readable('/proc/cpuinfo') ? substr_count(file_get_contents('/proc/cpuinfo'), 'processor') : 0;
} else {
$width = 0;
}
}
$width = 0;
}
} else {
$width = 0;
Expand Down