diff mbox series

stdlib: Improve tst-realpath compatibility with source fortification

Message ID 87y1j0w47p.fsf@oldenburg3.str.redhat.com
State New
Headers show
Series stdlib: Improve tst-realpath compatibility with source fortification | expand

Commit Message

Florian Weimer July 28, 2023, 1:33 p.m. UTC
On GCC before 11, IPA can make the fortified realpath aware that the
buffer size is not large enough (8 bytes instead of PATH_MAX bytes).
Fix this by using a buffer that is large enough.

Tested with GCC 8 and GCC 11 on x86_64-linux-gnu with and without
fortification.  Built with build-many-glibcs.py.  This probably should
not be part of the upcoming release because it's just a test failure, it
does not even break the test build.

---
 stdlib/tst-realpath.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


base-commit: 14126ff059e98e9236633741fd323a1116299872

Comments

Siddhesh Poyarekar July 28, 2023, 7:01 p.m. UTC | #1
On 2023-07-28 09:33, Florian Weimer via Libc-alpha wrote:
> On GCC before 11, IPA can make the fortified realpath aware that the
> buffer size is not large enough (8 bytes instead of PATH_MAX bytes).
> Fix this by using a buffer that is large enough.
> 
> Tested with GCC 8 and GCC 11 on x86_64-linux-gnu with and without
> fortification.  Built with build-many-glibcs.py.  This probably should
> not be part of the upcoming release because it's just a test failure, it
> does not even break the test build.

LGTM.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>

> ---
>   stdlib/tst-realpath.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/stdlib/tst-realpath.c b/stdlib/tst-realpath.c
> index f325c95a44..3694ecd8af 100644
> --- a/stdlib/tst-realpath.c
> +++ b/stdlib/tst-realpath.c
> @@ -24,6 +24,7 @@
>      License along with the GNU C Library; if not, see
>      <https://www.gnu.org/licenses/>.  */
>   
> +#include <limits.h>
>   #include <stdio.h>
>   #include <stdlib.h>
>   #include <malloc.h>
> @@ -50,7 +51,11 @@ void dealloc (void *p)
>   
>   char* alloc (void)
>   {
> -  return (char *)malloc (8);
> +#ifdef PATH_MAX
> +  return (char *)malloc (PATH_MAX);
> +#else
> +  return (char *)malloc (4096);
> +#endif
>   }
>   
>   static int
> 
> base-commit: 14126ff059e98e9236633741fd323a1116299872
>
diff mbox series

Patch

diff --git a/stdlib/tst-realpath.c b/stdlib/tst-realpath.c
index f325c95a44..3694ecd8af 100644
--- a/stdlib/tst-realpath.c
+++ b/stdlib/tst-realpath.c
@@ -24,6 +24,7 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
@@ -50,7 +51,11 @@  void dealloc (void *p)
 
 char* alloc (void)
 {
-  return (char *)malloc (8);
+#ifdef PATH_MAX
+  return (char *)malloc (PATH_MAX);
+#else
+  return (char *)malloc (4096);
+#endif
 }
 
 static int