Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / hurd / alloc-fd.c

diff --git a/hurd/alloc-fd.c b/hurd/alloc-fd.c
index f21d5bb8e15b9200207a9cde1a3083ada50732b4..8630b2eb477c43fe9844809c065ef0ebc32aba90 100644 (file)
--- a/hurd/alloc-fd.c
+++ b/hurd/alloc-fd.c
@@ -1,20 +1,19 @@
-/* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1994-2016 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <hurd.h>
 #include <hurd/fd.h>
@@ -97,6 +96,13 @@ _hurd_alloc_fd (int *fd, int first_fd)
          else if (size <= first_fd)
            size = first_fd + 1;
 
+         if (size * sizeof (*_hurd_dtable) < size)
+           {
+             /* Integer overflow! */
+             errno = ENOMEM;
+             goto out;
+           }
+
          /* If we fail to allocate that, decrement the desired size
             until we succeed in allocating it.  */
          do
@@ -117,6 +123,8 @@ _hurd_alloc_fd (int *fd, int first_fd)
              /* Go back to the loop to initialize the first new slot.  */
              goto search;
            }
+         else
+           errno = ENOMEM;
        }
       else
        errno = EMFILE;
@@ -124,6 +132,7 @@ _hurd_alloc_fd (int *fd, int first_fd)
   else
     errno = EINVAL;            /* Bogus FIRST_FD value.  */
 
+ out:
   __mutex_unlock (&_hurd_dtable_lock);
   _hurd_critical_section_unlock (crit);