From d39094af97e61b4f863744f5cf43ad37d28898c3 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Tue, 1 Sep 2020 15:15:09 +0000 Subject: pw: Handle errors from ftell() when removing records from /etc/opiekeys. Reported by: Coverity MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. --- pw/pw_user.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pw/pw_user.c b/pw/pw_user.c index cb95d45..2eec317 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -712,24 +712,24 @@ rmopie(char const * name) { char tmp[1014]; FILE *fp; - int fd; size_t len; - off_t atofs = 0; - + long atofs; + int fd; + if ((fd = openat(conf.rootfd, "etc/opiekeys", O_RDWR)) == -1) return; fp = fdopen(fd, "r+"); len = strlen(name); - while (fgets(tmp, sizeof(tmp), fp) != NULL) { + for (atofs = 0; fgets(tmp, sizeof(tmp), fp) != NULL && atofs >= 0; + atofs = ftell(fp)) { if (strncmp(name, tmp, len) == 0 && tmp[len]==' ') { /* Comment username out */ if (fseek(fp, atofs, SEEK_SET) == 0) fwrite("#", 1, 1, fp); break; } - atofs = ftell(fp); } /* * If we got an error of any sort, don't update! -- cgit v1.2.3-56-ge451