proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-24 08:36:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ProcFSTools: implement conforming parse_mounts

Browse Source 
There are a few places where we grep over /proc/mounts
without taking the encoding into acount.
ProcFSTools::parse_mounts parses mount data and decodes all
the special character the kernel might encode into it.

Shortcut: parse_proc_mounts to do
parse_mounts(read_proc_mounts()).
is_mounted() updated to parse mounts correctly.
This commit is contained in:
Wolfgang Bumiller 2015-11-12 11:23:39 +01:00 committed by Dietmar Maurer
parent c8ae5c7e9c
commit 072dfa92a5
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/PVE/ProcFSTools.pm
View File

@ -289,18 +289,42 @@ sub read_proc_mounts {
return PVE::Tools::file_get_contents("/proc/mounts");
}
# mounts encode spaces (\040), tabs (\011), newlines (\012), backslashes (\\ or \134)
sub decode_mount {
my ($str) = @_;
return $str =~ s/\\(?:040|01[12]|134|\\)/"\"$&\""/geer;
}
sub parse_mounts {
my ($mounts) = @_;
my $mntent = [];
while ($mounts =~ /^\s*([^#].*)$/gm) {
# lines from the file are encoded so we can just split at spaces
my ($what, $dir, $fstype, $opts) = split(/[ \t]/, $1, 4);
my ($freq, $passno) = (0, 0);
# in glibc's parser frequency and pass seem to be optional
$freq = $1 if $opts =~ s/\s+(\d+)$//;
$passno = $1 if $opts =~ s/\s+(\d+)$//;
push @$mntent, [decode_mount($what),
decode_mount($dir),
decode_mount($fstype),
decode_mount($opts),
$freq, $passno];
}
return $mntent;
}
sub parse_proc_mounts {
return parse_mounts(read_proc_mounts());
}
sub is_mounted {
my ($mountpoint) = @_;
$mountpoint = Cwd::realpath($mountpoint);
my $mountdata = read_proc_mounts();
if ($mountdata =~ m/\s$mountpoint\s/) {
return 1;
} else {
return 0;
}
my $mounts = parse_proc_mounts();
return (grep { $_->[1] eq $mountpoint } @$mounts) ? 1 : 0;
}
sub read_proc_net_ipv6_route {