Fix a few asserts and IO calls in nscd.

The nscd/*cache.c files contain assert()s, writeall() and sendfileall() calls
that invalidly use together &dataset->resp and total where either dataset or
dataset->head.recsize should be used instead one of the components. In the
writeall() and sendfileall() cases, it is unlikely to matter in practice, but
the assertions can fail sometimes without a proper reason.

diff --git a/ChangeLog b/ChangeLog
index 3fae50558695707a010b2021f7f69f6786037ddb..47241cc9ae123f8124340020469a6c7a33a3d7c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-18  Anders Johansson  <ajohansson@novell.com>
+
+       * nscd/aicache.c: Fix mixing up dataset and dataset->resp
+       offsets and record sizes in assert()s and response sending.
+       * nscd/grpcache.c: Likewise.
+       * nscd/hstcache.c: Likewise.
+       * nscd/initgrcache.c: Likewise.
+       * nscd/pwdcache.c: Likewise.
+
 2009-10-29  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #10540]

diff --git a/nscd/aicache.c b/nscd/aicache.c
index 524c0a63af0080fc50a3b56830ef13b1d7a808be..992357d2fee47206ec17bee440fff9941cc79381 100644 (file)
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -453,13 +453,13 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
            {
              assert (db->wr_fd != -1);
              assert ((char *) &dataset->resp > (char *) db->data);
-             assert ((char *) &dataset->resp - (char *) db->head + total
+             assert ((char *) dataset - (char *) db->head + total
                      <= (sizeof (struct database_pers_head)
                          + db->head->module * sizeof (ref_t)
                          + db->head->data_size));
              ssize_t written;
              written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp
-                                    - (char *) db->head, total);
+                                    - (char *) db->head, dataset->head.recsize);
 # ifndef __ASSUME_SENDFILE
              if (written == -1 && errno == ENOSYS)
                goto use_write;
@@ -470,7 +470,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
          use_write:
 # endif
 #endif
-           writeall (fd, &dataset->resp, total);
+           writeall (fd, &dataset->resp, dataset->head.recsize);
        }
 
       goto out;

diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 184d53898ca371f3ab8a90f3cecc53e855c1683c..bd101c675dd9d7f751ba5ce46f508cadde7a6f9d 100644 (file)
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -295,14 +295,14 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
            {
              assert (db->wr_fd != -1);
              assert ((char *) &dataset->resp > (char *) db->data);
-             assert ((char *) &dataset->resp - (char *) db->head
+             assert ((char *) dataset - (char *) db->head
                      + total
                      <= (sizeof (struct database_pers_head)
                          + db->head->module * sizeof (ref_t)
                          + db->head->data_size));
              written = sendfileall (fd, db->wr_fd,
                                     (char *) &dataset->resp
-                                    - (char *) db->head, total);
+                                    - (char *) db->head, dataset->head.recsize);
 # ifndef __ASSUME_SENDFILE
              if (written == -1 && errno == ENOSYS)
                goto use_write;
@@ -313,7 +313,7 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
          use_write:
 # endif
 #endif
-           written = writeall (fd, &dataset->resp, total);
+           written = writeall (fd, &dataset->resp, dataset->head.recsize);
        }
 
       /* Add the record to the database.  But only if it has not been

diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 51e2273960e728359531da5b5bf327bbfc33b7cf..228f6fd8ab1a7f54ac6644f702eec19d118bb5ab 100644 (file)
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -337,7 +337,7 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
            {
              assert (db->wr_fd != -1);
              assert ((char *) &dataset->resp > (char *) db->data);
-             assert ((char *) &dataset->resp - (char *) db->head
+             assert ((char *) dataset - (char *) db->head
                      + total
                      <= (sizeof (struct database_pers_head)
                          + db->head->module * sizeof (ref_t)

diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index c33aaf315f7df1eb0a5bd58ea70edfa68283149f..8195b6609eb37132b8e4c4b8757a435d46f37d44 100644 (file)
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -350,14 +350,14 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
            {
              assert (db->wr_fd != -1);
              assert ((char *) &dataset->resp > (char *) db->data);
-             assert ((char *) &dataset->resp - (char *) db->head
+             assert ((char *) dataset - (char *) db->head
                      + total
                      <= (sizeof (struct database_pers_head)
                          + db->head->module * sizeof (ref_t)
                          + db->head->data_size));
              written = sendfileall (fd, db->wr_fd,
                                     (char *) &dataset->resp
-                                    - (char *) db->head, total);
+                                    - (char *) db->head, dataset->head.recsize);
 # ifndef __ASSUME_SENDFILE
              if (written == -1 && errno == ENOSYS)
                goto use_write;
@@ -368,7 +368,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
          use_write:
 # endif
 #endif
-           written = writeall (fd, &dataset->resp, total);
+           written = writeall (fd, &dataset->resp, dataset->head.recsize);
        }
 
 

diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 2338e7e1e089c1e62052a48bce0d53efd77c60c8..75f2221e88be1c76b3a404b9b891c0727c5c0b59 100644 (file)
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -290,14 +290,14 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
            {
              assert (db->wr_fd != -1);
              assert ((char *) &dataset->resp > (char *) db->data);
-             assert ((char *) &dataset->resp - (char *) db->head
+             assert ((char *) dataset - (char *) db->head
                      + total
                      <= (sizeof (struct database_pers_head)
                           + db->head->module * sizeof (ref_t)
                           + db->head->data_size));
              written = sendfileall (fd, db->wr_fd,
                                     (char *) &dataset->resp
-                                    - (char *) db->head, total);
+                                    - (char *) db->head, dataset->head.recsize );
 # ifndef __ASSUME_SENDFILE
              if (written == -1 && errno == ENOSYS)
                goto use_write;
@@ -308,7 +308,7 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
          use_write:
 # endif
 #endif
-           written = writeall (fd, &dataset->resp, total);
+           written = writeall (fd, &dataset->resp, dataset->head.recsize);
        }