Skip to content

Commit

Permalink
Optimize pt_chown.
Browse files Browse the repository at this point in the history
Don't call chown and chmod if not necessary.
  • Loading branch information
Ulrich Drepper committed Jun 16, 2009
1 parent 292e3ab commit 837dea7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2009-06-15 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/grantpt.c (grantpt): Only call chown and
chmod if it is necessary.

[BZ #10166]
* sysdeps/unix/sysv/linux/grantpt.c: If slave device is on devpts or
devfs, the mode might not be correct. Check it and return only if it
Expand Down
7 changes: 4 additions & 3 deletions login/programs/pt_chown.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* pt_chmod - helper program for `grantpt'.
Copyright (C) 1998, 1999 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by C. Scott Ananian <cananian@alumni.princeton.edu>, 1998.
Expand Down Expand Up @@ -119,12 +119,13 @@ do_pt_chown (void)

/* Set the owner to the real user ID, and the group to that special
group ID. */
if (chown (pty, getuid (), gid) < 0)
if (st.st_gid != gid && chown (pty, getuid (), gid) < 0)
return FAIL_EACCES;

/* Set the permission mode to readable and writable by the owner,
and writable by the group. */
if (chmod (pty, S_IRUSR|S_IWUSR|S_IWGRP) < 0)
if ((st.st_mode & ACCESSPERMS) != (S_IRUSR|S_IWUSR|S_IWGRP)
&& chmod (pty, S_IRUSR|S_IWUSR|S_IWGRP) < 0)
return FAIL_EACCES;

return 0;
Expand Down

0 comments on commit 837dea7

Please sign in to comment.