Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use realpath() safely (#764369) 

realpath(3) manual page says:

    BUGS
        The POSIX.1-2001 standard version of this function is broken by
        design, since it is impossible to determine a suitable size for
        the output buffer, resolved_path.  According to POSIX.1-2001 a
        buffer of size PATH_MAX suffices, but PATH_MAX need not be a
        defined constant, and may have to be obtained using pathconf(3).
        And asking pathconf(3) does not really help, since, on the one
        hand POSIX warns that the result of pathconf(3) may be huge and
        unsuitable for mallocing memory, and on the other hand
        pathconf(3) may return -1 to signify that PATH_MAX is not
        bounded.  The resolved_path == NULL feature, not standardized in
        POSIX.1-2001, but standardized in POSIX.1-2008, allows this
        design problem to be avoided.

The resolved_path == NULL feature of realpath() has existed as a Glibc
extension since realpath() was first added to Glibc 1.90, released in
June 1996.  Therefore it can be used unconditionally.

    https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fa0bc87c32d02cd81ec4d0ae00e0d943c683e6e1

Bug 764369 - Use realpath() safely
This commit is contained in:
Mike Fleetwood 2016-03-18 16:30:41 +00:00 committed by Curtis Gedak
parent a681f9f637
commit d04826cc27
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/DMRaid.cc
View File

@ -17,6 +17,7 @@
#include "../include/DMRaid.h"
#include "../include/Partition.h"
#include <limits.h>
#include <stdlib.h> //atoi function
namespace GParted
@ -126,11 +127,11 @@ bool DMRaid::is_dmraid_device( const Glib::ustring & dev_path )
if ( ! device_found && file_test( dev_path, Glib::FILE_TEST_IS_SYMLINK ) )
{
//Path is a symbolic link so find real path
char c_str[4096+1] ;
//FIXME: it seems realpath is very unsafe to use (manpage)...
if ( realpath( dev_path .c_str(), c_str ) != NULL )
char * rpath = realpath( dev_path.c_str(), NULL );
if ( rpath != NULL )
{
Glib::ustring tmp_path = c_str ;
Glib::ustring tmp_path = rpath;
free( rpath );
if ( tmp_path .length() > 0 )
for ( unsigned int k=0; k < dmraid_devices .size(); k++ )
if ( tmp_path .find( dmraid_devices[k] ) != Glib::ustring::npos )
@ -196,11 +197,11 @@ Glib::ustring DMRaid::get_dmraid_name( const Glib::ustring & dev_path )
if ( dmraid_name .empty() && file_test( dev_path, Glib::FILE_TEST_IS_SYMLINK ) )
{
//Path is a symbolic link so find real path
char c_str[4096+1] ;
//FIXME: it seems realpath is very unsafe to use (manpage)...
if( realpath( dev_path .c_str(), c_str ) != NULL )
char * rpath = realpath( dev_path.c_str(), NULL );
if ( rpath != NULL )
{
Glib::ustring tmp_path = c_str ;
Glib::ustring tmp_path = rpath;
free( rpath );
if ( tmp_path .length() > 0 )
for ( unsigned int k=0; k < dmraid_devices .size(); k++ )
if ( tmp_path .find( dmraid_devices[k] ) != Glib::ustring::npos )

13
src/GParted_Core.cc
View File

@ -47,11 +47,14 @@
#include "../include/reiser4.h"
#include "../include/ufs.h"
#include "../include/Copy_Blocks.h"
#include <set>
#include <cerrno>
#include <cstring>
#include <sys/types.h>
#include <sys/stat.h>
#include <limits.h>
#include <stdlib.h>
#include <unistd.h>
#include <dirent.h>
#include <mntent.h>
@ -1091,10 +1094,12 @@ void GParted_Core::add_node_and_mountpoint(
// then find real path and add entry too
if ( file_test( node, Glib::FILE_TEST_IS_SYMLINK ) )
{
char c_str[4096+1] ;
//FIXME: it seems realpath is very unsafe to use (manpage)...
if ( realpath( node .c_str(), c_str ) != NULL )
map[ c_str ] .push_back( mountpoint ) ;
char * rpath = realpath( node.c_str(), NULL );
if ( rpath != NULL )
{
map[rpath].push_back( mountpoint );
free( rpath );
}
}
}
}

13
src/Proc_Partitions_Info.cc
View File

@ -17,6 +17,8 @@
#include "../include/Proc_Partitions_Info.h"
#include <fstream>
#include <limits.h>
#include <stdlib.h>
namespace GParted
{
@ -131,16 +133,17 @@ void Proc_Partitions_Info::load_proc_partitions_info_cache()
line = "/dev/" ;
line += c_str ;
//FIXME: it seems realpath is very unsafe to use (manpage)...
if ( file_test( line, Glib::FILE_TEST_EXISTS )
&& realpath( line .c_str(), c_str )
char * rpath = NULL;
if ( file_test( line, Glib::FILE_TEST_EXISTS )
&& ( ( rpath = realpath( line.c_str(), NULL ) ) != NULL )
//&& line != c_str
)
{
//Because we can make no assumption about which path libparted will
//detect, we add all combinations.
alternate_paths_cache[ c_str ] = line ;
alternate_paths_cache[ line ] = c_str ;
alternate_paths_cache[rpath] = line;
alternate_paths_cache[line] = rpath;
free( rpath );
}
}