diff options
author | Steve Dickson <steved@redhat.com> | 2009-03-23 17:13:01 -0400 |
---|---|---|
committer | Steve Dickson <steved@redhat.com> | 2009-03-23 17:13:01 -0400 |
commit | 3724317e223d46908aac2405bbd73ea2de4f36e5 (patch) | |
tree | 4498459f0dd3f88349c5126792f3715200397eed /utils/statd | |
parent | d62365079f711b25e73522b2af380abc2a7e2788 (diff) | |
download | nfs-utils-3724317e223d46908aac2405bbd73ea2de4f36e5.tar.gz nfs-utils-3724317e223d46908aac2405bbd73ea2de4f36e5.tar.xz nfs-utils-3724317e223d46908aac2405bbd73ea2de4f36e5.zip |
In recent Fedora builds, the '-D _FORTIFY_SOURCE=2' compile
flag has been set. This cause warnings to be generated when
return values from reads/writes (and other calls) are not
checked. The patch address those warnings.
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/statd')
-rw-r--r-- | utils/statd/monitor.c | 5 | ||||
-rw-r--r-- | utils/statd/sm-notify.c | 13 | ||||
-rw-r--r-- | utils/statd/statd.c | 40 |
3 files changed, 43 insertions, 15 deletions
diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c index 169cd78..a2c9e2b 100644 --- a/utils/statd/monitor.c +++ b/utils/statd/monitor.c @@ -204,7 +204,10 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) e += sprintf(e, "%02x", 0xff & (argp->priv[i])); if (e+1-buf != LINELEN) abort(); e += sprintf(e, " %s %s\n", mon_name, my_name); - write(fd, buf, e-buf); + if (write(fd, buf, e-buf) != (e-buf)) { + note(N_WARNING, "writing to %s failed: errno %d (%s)", + path, errno, strerror(errno)); + } } free(path); diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index d58e0be..f1fc619 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -782,7 +782,10 @@ static int record_pid(void) fd = open("/var/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600); if (fd < 0) return 0; - write(fd, pid, strlen(pid)); + if (write(fd, pid, strlen(pid)) != strlen(pid)) { + nsm_log(LOG_WARNING, "Writing to pid file failed: errno %d(%s)", + errno, strerror(errno)); + } close(fd); return 1; } @@ -818,12 +821,16 @@ static void drop_privs(void) static void set_kernel_nsm_state(int state) { int fd; + const char *file = "/proc/sys/fs/nfs/nsm_local_state"; - fd = open("/proc/sys/fs/nfs/nsm_local_state",O_WRONLY); + fd = open(file ,O_WRONLY); if (fd >= 0) { char buf[20]; snprintf(buf, sizeof(buf), "%d", state); - write(fd, buf, strlen(buf)); + if (write(fd, buf, strlen(buf)) != strlen(buf)) { + nsm_log(LOG_WARNING, "Writing to '%s' failed: errno %d (%s)", + file, errno, strerror(errno)); + } close(fd); } } diff --git a/utils/statd/statd.c b/utils/statd/statd.c index 6da2ab2..1c5247e 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -179,14 +179,20 @@ static void create_pidfile(void) pidfile, strerror(errno)); fprintf(fp, "%d\n", getpid()); pidfd = dup(fileno(fp)); - if (fclose(fp) < 0) - note(N_WARNING, "Flushing pid file failed.\n"); + if (fclose(fp) < 0) { + note(N_WARNING, "Flushing pid file failed: errno %d (%s)\n", + errno, strerror(errno)); + } } static void truncate_pidfile(void) { - if (pidfd >= 0) - ftruncate(pidfd, 0); + if (pidfd >= 0) { + if (ftruncate(pidfd, 0) < 0) { + note(N_WARNING, "truncating pid file failed: errno %d (%s)\n", + errno, strerror(errno)); + } + } } static void drop_privs(void) @@ -207,9 +213,12 @@ static void drop_privs(void) /* better chown the pid file before dropping, as if it * if over nfs we might loose access */ - if (pidfd >= 0) - fchown(pidfd, st.st_uid, st.st_gid); - + if (pidfd >= 0) { + if (fchown(pidfd, st.st_uid, st.st_gid) < 0) { + note(N_ERROR, "Unable to change owner of %s: %d (%s)", + SM_DIR, strerror (errno)); + } + } setgroups(0, NULL); if (setgid(st.st_gid) == -1 || setuid(st.st_uid) == -1) { @@ -495,7 +504,10 @@ int main (int argc, char **argv) /* If we got this far, we have successfully started, so notify parent */ if (pipefds[1] > 0) { status = 0; - write(pipefds[1], &status, 1); + if (write(pipefds[1], &status, 1) != 1) { + note(N_WARNING, "writing to parent pipe failed: errno %d (%s)\n", + errno, strerror(errno)); + } close(pipefds[1]); pipefds[1] = -1; } @@ -534,17 +546,23 @@ static void load_state_number(void) { int fd; + const char *file = "/proc/sys/fs/nfs/nsm_local_state"; if ((fd = open(SM_STAT_PATH, O_RDONLY)) == -1) return; - read(fd, &MY_STATE, sizeof(MY_STATE)); + if (read(fd, &MY_STATE, sizeof(MY_STATE)) != sizeof(MY_STATE)) { + note(N_WARNING, "Unable to read state from '%s': errno %d (%s)", + SM_STAT_PATH, errno, strerror(errno)); + } close(fd); - fd = open("/proc/sys/fs/nfs/nsm_local_state",O_WRONLY); + fd = open(file, O_WRONLY); if (fd >= 0) { char buf[20]; snprintf(buf, sizeof(buf), "%d", MY_STATE); - write(fd, buf, strlen(buf)); + if (write(fd, buf, strlen(buf)) != strlen(buf)) + note(N_WARNING, "Writing to '%s' failed: errno %d (%s)", + file, errno, strerror(errno)); close(fd); } |