This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-199-g543ef57
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 31 Aug 2015 16:15:40 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-199-g543ef57
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 543ef578c3304661713950b37abd0c916f52ecf0 (commit)
from 3f563e90e85cb378f9f40e6a10bc50b309b39ab1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=543ef578c3304661713950b37abd0c916f52ecf0
commit 543ef578c3304661713950b37abd0c916f52ecf0
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue Aug 25 23:42:01 2015 -0700
Fix broken overflow check in posix_fallocate [BZ 18873]
* sysdeps/posix/posix_fallocate.c (posix_fallocate):
* sysdeps/posix/posix_fallocate64.c (__posix_fallocate64_l64):
Fix parenthesization typo.
diff --git a/ChangeLog b/ChangeLog
index 99129d3..09224e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-31 Paul Eggert <eggert@cs.ucla.edu>
+
+ [BZ #18873]
+ Fix broken overflow check in posix_fallocate
+ * sysdeps/posix/posix_fallocate.c (posix_fallocate):
+ * sysdeps/posix/posix_fallocate64.c (__posix_fallocate64_l64):
+ Fix parenthesization typo.
+
2015-08-28 Mike Frysinger <vapier@gentoo.org>
[BZ #18887]
diff --git a/NEWS b/NEWS
index e91d669..20fa6ac 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ Version 2.23
2898, 14341, 15786, 16141, 16517, 16519, 16520, 16734, 16973, 17787,
17905, 18084, 18086, 18240, 18265, 18370, 18421, 18480, 18525, 18610,
18618, 18647, 18661, 18674, 18681, 18778, 18781, 18787, 18789, 18790,
- 18795, 18796, 18820, 18823, 18824, 18863, 18887.
+ 18795, 18796, 18820, 18823, 18824, 18863, 18873, 18887.
* The obsolete header <regexp.h> has been removed. Programs that require
this header must be updated to use <regex.h> instead.
diff --git a/sysdeps/posix/posix_fallocate.c b/sysdeps/posix/posix_fallocate.c
index e7fe201..d0479a6 100644
--- a/sysdeps/posix/posix_fallocate.c
+++ b/sysdeps/posix/posix_fallocate.c
@@ -37,7 +37,7 @@ posix_fallocate (int fd, __off_t offset, __off_t len)
/* Perform overflow check. The outer cast relies on a GCC
extension. */
- if ((__off_t) ((uint64_t) offset) + ((uint64_t) len) < 0)
+ if ((__off_t) ((uint64_t) offset + (uint64_t) len) < 0)
return EFBIG;
/* pwrite below will not do the right thing in O_APPEND mode. */
diff --git a/sysdeps/posix/posix_fallocate64.c b/sysdeps/posix/posix_fallocate64.c
index ee32679..fb2dac6 100644
--- a/sysdeps/posix/posix_fallocate64.c
+++ b/sysdeps/posix/posix_fallocate64.c
@@ -37,7 +37,7 @@ __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len)
/* Perform overflow check. The outer cast relies on a GCC
extension. */
- if ((__off64_t) ((uint64_t) offset) + ((uint64_t) len) < 0)
+ if ((__off64_t) ((uint64_t) offset + (uint64_t) len) < 0)
return EFBIG;
/* pwrite64 below will not do the right thing in O_APPEND mode. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
NEWS | 2 +-
sysdeps/posix/posix_fallocate.c | 2 +-
sysdeps/posix/posix_fallocate64.c | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources