about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-01 10:33:11 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-03 11:39:30 -0700
commit4f75b7a09a57e0d33ee0741c18114ce8ac5d6c3f (patch)
treef128c28bda6d3832f80be759a353918def8acd44 /elf
parent0c41943a4d6dc2ce7fbf1ee90d9000852f177a89 (diff)
downloadglibc-4f75b7a09a57e0d33ee0741c18114ce8ac5d6c3f.tar.gz
glibc-4f75b7a09a57e0d33ee0741c18114ce8ac5d6c3f.tar.xz
glibc-4f75b7a09a57e0d33ee0741c18114ce8ac5d6c3f.zip
Distinguish ELOOP diagnosis threshold from SYMLOOP_MAX.
Diffstat (limited to 'elf')
-rw-r--r--elf/chroot_canon.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/elf/chroot_canon.c b/elf/chroot_canon.c
index a7a7d9b225..397125fe60 100644
--- a/elf/chroot_canon.c
+++ b/elf/chroot_canon.c
@@ -1,6 +1,5 @@
 /* Return the canonical absolute name of a given file inside chroot.
-   Copyright (C) 1996,1997,1998,1999,2000,2001,2004,2005,2010,2011
-	Free Software Foundation, Inc.
+   Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,12 +19,12 @@
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include <eloop-threshold.h>
 #include <ldconfig.h>
 
 #ifndef PATH_MAX
@@ -127,7 +126,7 @@ chroot_canon (const char *chroot, const char *name)
 	      char *buf = alloca (PATH_MAX);
 	      size_t len;
 
-	      if (++num_links > MAXSYMLINKS)
+	      if (++num_links > __eloop_threshold ())
 		{
 		  __set_errno (ELOOP);
 		  goto error;