summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/grantpt.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-06-15 22:56:51 -0700
committerUlrich Drepper <drepper@redhat.com>2009-06-15 22:56:51 -0700
commit292e3abebff9f94ca47c1a725a691cb6ed6cff5f (patch)
treec6ad0a749bdd53d1d021e8b5739a0d6580014bc0 /sysdeps/unix/sysv/linux/grantpt.c
parent395a37e379bf900b2b6a25e17c44cde2d1c46c44 (diff)
downloadglibc-292e3abebff9f94ca47c1a725a691cb6ed6cff5f.tar.gz
glibc-292e3abebff9f94ca47c1a725a691cb6ed6cff5f.tar.xz
glibc-292e3abebff9f94ca47c1a725a691cb6ed6cff5f.zip
Fix permission of slave device on devpts if necessary.
If devptr is misconfigured the slave device permission after grantpt
might not be 0620.  BZ #10166
Diffstat (limited to 'sysdeps/unix/sysv/linux/grantpt.c')
-rw-r--r--sysdeps/unix/sysv/linux/grantpt.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/grantpt.c b/sysdeps/unix/sysv/linux/grantpt.c
index b894b8b631..c858f89c8b 100644
--- a/sysdeps/unix/sysv/linux/grantpt.c
+++ b/sysdeps/unix/sysv/linux/grantpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2001, 2002, 2009 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
@@ -70,9 +70,16 @@ grantpt (int fd)
     return -1;
 
   /* If the slave pseudo terminal lives on a `devpts' filesystem, the
-     ownership and access permission are already set.  */
+     ownership is already set and the access permission might already
+     be set.  */
   if (fsbuf.f_type == DEVPTS_SUPER_MAGIC || fsbuf.f_type == DEVFS_SUPER_MAGIC)
-    return 0;
+    {
+      struct stat64 st;
+
+      if (fstat (fd, &st) == 0
+	  && (st.st_mode & ACCESSPERMS) == (S_IRUSR|S_IWUSR|S_IWGRP))
+	return 0;
+    }
 
   return __unix_grantpt (fd);
 }