Skip to content
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.

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

sanitise results of stat()/lstat() on Solaris #504

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

six809
Copy link

@six809 six809 commented Jul 7, 2023

Solaris 11 (possibly only 11.4) can return negative values for st_atim.tv_nsec, st_mtim.tv_nsec and st_ctim.tv_nsec.

Gnulib already identifies this as an issue and works around it with stat_time_normalize(). I've adapted that function for this patch, omitting st_ctim (unused by rsync) and using only a very simple test for time_t overflow.

The feature test macros used mean this code path will be used on all Solaris builds, but this shouldn't be an issue; it would probably be safe on anything that provides tv_nsec.

Solaris 11 (possibly only 11.4) can return negative values for
st_atim.tv_nsec, st_mtim.tv_nsec and st_ctim.tv_nsec.

Gnulib already identifies this as an issue and works around it with
stat_time_normalize().  I've adapted that function for this patch,
omitting st_ctim (unused by rsync) and using only a very simple test for
time_t overflow.

The feature test macros used mean this code path will be used on _all_
Solaris builds, but this shouldn't be an issue; it would probably be
safe on anything that provides tv_nsec.
@tridge
Copy link
Member

tridge commented Apr 6, 2024

@WayneD looks good, pending your OK

Comment on lines +155 to +186
int stat_time_normalize(int result, STRUCT_STAT *st)
{
#if defined __sun && defined HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
if (result == 0) {
long int timespec_hz = 1000000000;
short int const ts_off[] = { offsetof (struct stat, st_atim),
offsetof (struct stat, st_mtim) };
unsigned i;
for (i = 0; i < sizeof ts_off / sizeof *ts_off; i++) {
struct timespec *ts = (struct timespec *)((char *) st + ts_off[i]);
long int q = ts->tv_nsec / timespec_hz;
long int r = ts->tv_nsec % timespec_hz;
if (r < 0) {
r += timespec_hz;
q--;
}
ts->tv_nsec = r;
/* Overflow is possible, as Solaris 11 stat can yield
tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000. */
time_t sec = ts->tv_sec + q;
if ((q > 0 && sec < ts->tv_sec) || (q < 0 && sec > ts->tv_sec)) {
errno = EOVERFLOW;
return -1;
}
ts->tv_sec = sec;
}
}
#else
(void)st;
#endif
return result;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this function is utilized solely in scenarios where #if defined __sun && defined HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC is true, it would be more straightforward to not define it when this condition is not met.

E.g.,

#if defined __sun && defined HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
int stat_time_normalize(int result, STRUCT_STAT *st)
{
    if (result == 0) {
        long int timespec_hz = 1000000000;
        short int const ts_off[] = { offsetof (struct stat, st_atim),
                                     offsetof (struct stat, st_mtim) };
        unsigned i;
        for (i = 0; i < sizeof ts_off / sizeof *ts_off; i++) {
            struct timespec *ts = (struct timespec *)((char *) st + ts_off[i]);
            long int q = ts->tv_nsec / timespec_hz;
            long int r = ts->tv_nsec % timespec_hz;
            if (r < 0) {
                r += timespec_hz;
                q--;
            }
            ts->tv_nsec = r;
            /* Overflow is possible, as Solaris 11 stat can yield
               tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000.  */
            time_t sec = ts->tv_sec + q;
            if ((q > 0 && sec < ts->tv_sec) || (q < 0 && sec > ts->tv_sec)) {
                errno = EOVERFLOW;
                return -1;
            }
            ts->tv_sec = sec;
        }
    }
    return result;
}
#endif

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants