Changeset 428 for trunk/src/trustfile.c

Timestamp:

Mar 12, 2013, 9:42:07 PM (12 years ago)

Author:

katerina

Message:

Fix for ticket #335 (warn if buffer for group reading is too small).

File:

• trunk/src/trustfile.c (modified) (10 diffs)

trunk/src/trustfile.c

@@ -414 +414 @@
  */
 /* not static to circumvent stupid gcc 4 bug */ 
-int isingrp(gid_t grp, uid_t *ulist)
+int isingrp(gid_t grp, uid_t *ulist, int * errval)
 {
   struct passwd *w;             /* info about group member */
@@ -420 +420 @@
   register char **p;            /* points to current group member */
   struct group *g;              /* pointer to group information */
+
+  int status;
   
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
@@ -430 +432 @@
   SL_ENTER(_("isingrp"));
 
+  *errval = 0;
+
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   buffer = malloc(SH_GRBUF_SIZE);
-  sh_getgrgid_r(grp, &gr, buffer, SH_GRBUF_SIZE, &g);
-#else
+  status = sh_getgrgid_r(grp, &gr, buffer, SH_GRBUF_SIZE, &g);
+#else
+  errno = 0;
   g = sh_getgrgid(grp);
+  status = errno;
 #endif
 
   if (g == NULL)
     {
+      if (status == ERANGE)
+        *errval = status;
+
       goto end_false;
     }
@@ -510 +519 @@
  */
 /* not static to circumvent stupid gcc 4 bug */ 
-int onlytrustedingrp(gid_t grp, uid_t *ulist)
+int onlytrustedingrp(gid_t grp, uid_t *ulist, int * errval)
 {
   struct passwd *w;             /* info about group member */
@@ -518 +527 @@
   register int flag = -1;       /* group member found */
 
+  int status;
+
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   struct group    gr;
@@ -529 +540 @@
   SL_ENTER(_("onlytrustedingrp"));
 
+  *errval = 0;
+
 #ifdef TRUST_DEBUG
   fprintf(stderr, "trustfile: group writeable, group_gid: %ld\n", 
@@ -536 +549 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   buffer = malloc(SH_GRBUF_SIZE);
-  sh_getgrgid_r(grp, &gr, buffer, SH_GRBUF_SIZE, &g);
-#else
+  status = sh_getgrgid_r(grp, &gr, buffer, SH_GRBUF_SIZE, &g);
+#else
+  errno = 0;
   g = sh_getgrgid(grp);
+  status = errno;
 #endif
 
   if (g == NULL)
     {
+      if (status == ERANGE)
+        *errval = status;
+
 #ifdef TRUST_DEBUG
       fprintf(stderr, 
@@ -722 +740 @@
   char c;                       /* used to hold temp char          */
   
+  int errgrp = 0;
+
   SL_ENTER(_("sl_trustfile"));
   if (fname == NULL)
@@ -1010 +1030 @@
        */
       if (((stbuf.st_mode & S_IWGRP) == S_IWGRP) &&
-          ((okusers != NULL && !onlytrustedingrp((gid_t)stbuf.st_gid,okusers))||
-           (badusers != NULL && isingrp((gid_t)stbuf.st_gid, badusers)))
+          ((okusers != NULL && !onlytrustedingrp((gid_t)stbuf.st_gid,okusers,&errgrp))||
+           (badusers != NULL && isingrp((gid_t)stbuf.st_gid, badusers,&errgrp)))
 #ifdef STICKY
           && ((stbuf.st_mode&S_IFDIR) != S_IFDIR ||
@@ -1035 +1055 @@
           tf_badgid = (gid_t) stbuf.st_gid;
           free(fexp);
-          SL_IRETURN(SL_EBADGID, _("sl_trustfile"));
+          SL_IRETURN((errgrp == ERANGE) ? SL_ERANGE : SL_EBADGID, _("sl_trustfile"));
         }
       /*