| Message ID | 20230601142747.104444-6-fberat@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v5,01/12] catgets/gencat.c: fix warn unused result | expand |
On 2023-06-01 10:27, Frédéric Bérat wrote: > With fortification enabled, few function calls return result need to be > checked, has they get the __wur macro enabled. > --- > Changes since v4: > - Removed extra curly brackets LGTM. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> > > crypt/cert.c | 6 +++++- > misc/tst-efgcvt-template.c | 4 ++-- > posix/tst-nice.c | 3 +-- > posix/wordexp-test.c | 6 +++++- > stdio-common/bug19.c | 9 +++++++-- > stdio-common/bug6.c | 8 ++++---- > stdio-common/tstscanf.c | 14 ++++++++++++-- > stdlib/test-canon.c | 16 +++++++++++++--- > support/test-container.c | 4 ++-- > sysdeps/pthread/tst-cancel16.c | 6 +++++- > sysdeps/pthread/tst-cancel4.c | 6 ++++-- > 11 files changed, 60 insertions(+), 22 deletions(-) > > diff --git a/crypt/cert.c b/crypt/cert.c > index 32c4386caf..5b4277f76d 100644 > --- a/crypt/cert.c > +++ b/crypt/cert.c > @@ -99,7 +99,11 @@ get8 (char *cp) > int i,j,t; > > for(i=0;i<8;i++){ > - scanf("%2x",&t); > + if (scanf("%2x",&t) < 1) > + { > + if(ferror(stdin)) > + totfails++; > + } > if(feof(stdin)) > good_bye(); > for(j=0; j<8 ; j++) { > diff --git a/misc/tst-efgcvt-template.c b/misc/tst-efgcvt-template.c > index b924659a3d..87e3ebe4fa 100644 > --- a/misc/tst-efgcvt-template.c > +++ b/misc/tst-efgcvt-template.c > @@ -200,8 +200,8 @@ special (void) > output_error (NAME (ECVT), INFINITY, 10, "inf", 0, 0, p, decpt, sign); > > /* Simply make sure these calls with large NDIGITs don't crash. */ > - (void) ECVT (123.456, 10000, &decpt, &sign); > - (void) FCVT (123.456, 10000, &decpt, &sign); > + p = ECVT (123.456, 10000, &decpt, &sign); > + p = FCVT (123.456, 10000, &decpt, &sign); > > /* Some tests for the reentrant functions. */ > /* Use a too small buffer. */ > diff --git a/posix/tst-nice.c b/posix/tst-nice.c > index fe9888b3f6..59cf953e27 100644 > --- a/posix/tst-nice.c > +++ b/posix/tst-nice.c > @@ -58,8 +58,7 @@ do_test (void) > > /* BZ #18086. Make sure we don't reset errno. */ > errno = EBADF; > - nice (0); > - if (errno != EBADF) > + if (nice (0) == -1 || errno != EBADF) > { > printf ("FAIL: errno = %i, but wanted EBADF (%i)\n", errno, EBADF); > return 1; > diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c > index 87d537c931..057c89dd3c 100644 > --- a/posix/wordexp-test.c > +++ b/posix/wordexp-test.c > @@ -253,7 +253,11 @@ do_test (int argc, char *argv[]) > cwd = getcwd (NULL, 0); > > /* Set up arena for pathname expansion */ > - tmpnam (tmpdir); > + if (!tmpnam (tmpdir)) > + { > + printf ("Failed to create a temporary directory with a unique name: %m"); > + return 1; > + } > xmkdir (tmpdir, S_IRWXU); > TEST_VERIFY_EXIT (chdir (tmpdir) == 0); > > diff --git a/stdio-common/bug19.c b/stdio-common/bug19.c > index e083304bda..9a3deac3fc 100644 > --- a/stdio-common/bug19.c > +++ b/stdio-common/bug19.c > @@ -29,12 +29,17 @@ do_test (void) > printf("checking sscanf\n"); > > int i, j, n; > + int result = 0; > > i = j = n = 0; > - FSCANF (fp, L(" %i - %i %n"), &i, &j, &n); > + if (FSCANF (fp, L(" %i - %i %n"), &i, &j, &n) < 2) > + { > + printf ("FSCANF couldn't read all parameters %d\n", errno); > + result = 1; > + } > + > printf ("found %i-%i (length=%i)\n", i, j, n); > > - int result = 0; > if (i != 7) > { > printf ("i is %d, expected 7\n", i); > diff --git a/stdio-common/bug6.c b/stdio-common/bug6.c > index 0db63a3b44..50098bf3f2 100644 > --- a/stdio-common/bug6.c > +++ b/stdio-common/bug6.c > @@ -7,16 +7,16 @@ main (void) > int i; > int lost = 0; > > - scanf ("%2s", buf); > + lost = (scanf ("%2s", buf) < 0); > lost |= (buf[0] != 'X' || buf[1] != 'Y' || buf[2] != '\0'); > if (lost) > puts ("test of %2s failed."); > - scanf (" "); > - scanf ("%d", &i); > + lost |= (scanf (" ") < 0); > + lost |= (scanf ("%d", &i) < 0); > lost |= (i != 1234); > if (lost) > puts ("test of %d failed."); > - scanf ("%c", buf); > + lost |= (scanf ("%c", buf) < 0); > lost |= (buf[0] != 'L'); > if (lost) > puts ("test of %c failed.\n"); > diff --git a/stdio-common/tstscanf.c b/stdio-common/tstscanf.c > index 3a4ebf7524..7e92df4720 100644 > --- a/stdio-common/tstscanf.c > +++ b/stdio-common/tstscanf.c > @@ -120,7 +120,12 @@ main (int argc, char **argv) > int i; > float x; > char name[50]; > - (void) fscanf (in, "%2d%f%*d %[0123456789]", &i, &x, name); > + if (fscanf (in, "%2d%f%*d %[0123456789]", &i, &x, name) < 3) > + { > + fputs ("test failed!\n", stdout); > + result = 1; > + } > + > fprintf (out, "i = %d, x = %f, name = \"%.50s\"\n", i, x, name); > if (i != 56 || x != 789.0F || strcmp (name, "56")) > { > @@ -164,7 +169,12 @@ main (int argc, char **argv) > quant = 0.0; > units[0] = item[0] = '\0'; > count = fscanf (in, "%f%20s of %20s", &quant, units, item); > - (void) fscanf (in, "%*[^\n]"); > + if (fscanf (in, "%*[^\n]") < 0 && ferror (in)) > + { > + fputs ("test failed!\n", stdout); > + result = 1; > + } > + > fprintf (out, "count = %d, quant = %f, item = %.21s, units = %.21s\n", > count, quant, item, units); > if (count != ok[rounds-1].count || quant != ok[rounds-1].quant > diff --git a/stdlib/test-canon.c b/stdlib/test-canon.c > index 5a2e7e1e6e..407ad5c4a2 100644 > --- a/stdlib/test-canon.c > +++ b/stdlib/test-canon.c > @@ -123,8 +123,13 @@ do_test (int argc, char ** argv) > int i, errors = 0; > char buf[PATH_MAX]; > > - getcwd (cwd, sizeof (buf)); > - cwd_len = strlen (cwd); > + if (getcwd (cwd, sizeof (buf))) > + cwd_len = strlen (cwd); > + else > + { > + printf ("%s: current working directory couldn't be retrieved\n", argv[0]); > + ++errors; > + } > > errno = 0; > if (realpath (NULL, buf) != NULL || errno != EINVAL) > @@ -210,7 +215,12 @@ do_test (int argc, char ** argv) > free (result2); > } > > - getcwd (buf, sizeof (buf)); > + if (!getcwd (buf, sizeof (buf))) > + { > + printf ("%s: current working directory couldn't be retrieved\n", argv[0]); > + ++errors; > + } > + > if (strcmp (buf, cwd)) > { > printf ("%s: current working directory changed from %s to %s\n", > diff --git a/support/test-container.c b/support/test-container.c > index 37beb778d6..f51afefedb 100644 > --- a/support/test-container.c > +++ b/support/test-container.c > @@ -714,8 +714,8 @@ check_for_unshare_hints (int require_pidns) > continue; > > val = -1; /* Sentinel. */ > - fscanf (f, "%d", &val); > - if (val != files[i].bad_value) > + int cnt = fscanf (f, "%d", &val); > + if (cnt == 1 && val != files[i].bad_value) > continue; > > printf ("To enable test-container, please run this as root:\n"); > diff --git a/sysdeps/pthread/tst-cancel16.c b/sysdeps/pthread/tst-cancel16.c > index 511b9e1e91..d47c7c68cb 100644 > --- a/sysdeps/pthread/tst-cancel16.c > +++ b/sysdeps/pthread/tst-cancel16.c > @@ -50,7 +50,11 @@ tf (void *arg) > pthread_cleanup_push (cl, NULL); > > /* This call should never return. */ > - (void) lockf (fd, F_LOCK, 0); > + if (lockf (fd, F_LOCK, 0)) > + { > + puts ("child thread: lockf failed"); > + exit (1); > + } > > pthread_cleanup_pop (0); > > diff --git a/sysdeps/pthread/tst-cancel4.c b/sysdeps/pthread/tst-cancel4.c > index 4f5c89314c..4c9e8670ca 100644 > --- a/sysdeps/pthread/tst-cancel4.c > +++ b/sysdeps/pthread/tst-cancel4.c > @@ -1009,7 +1009,8 @@ tf_pread (void *arg) > pthread_cleanup_push (cl, NULL); > > char mem[10]; > - pread (tempfd, mem, sizeof (mem), 0); > + if (pread (tempfd, mem, sizeof (mem), 0) < 0) > + FAIL_EXIT1 ("pread failed: %m"); > > pthread_cleanup_pop (0); > > @@ -1038,7 +1039,8 @@ tf_pwrite (void *arg) > pthread_cleanup_push (cl, NULL); > > char mem[10]; > - pwrite (tempfd, mem, sizeof (mem), 0); > + if (pwrite (tempfd, mem, sizeof (mem), 0) <0) > + FAIL_EXIT1 ("pwrite failed: %m"); > > pthread_cleanup_pop (0); >
diff --git a/crypt/cert.c b/crypt/cert.c index 32c4386caf..5b4277f76d 100644 --- a/crypt/cert.c +++ b/crypt/cert.c @@ -99,7 +99,11 @@ get8 (char *cp) int i,j,t; for(i=0;i<8;i++){ - scanf("%2x",&t); + if (scanf("%2x",&t) < 1) + { + if(ferror(stdin)) + totfails++; + } if(feof(stdin)) good_bye(); for(j=0; j<8 ; j++) { diff --git a/misc/tst-efgcvt-template.c b/misc/tst-efgcvt-template.c index b924659a3d..87e3ebe4fa 100644 --- a/misc/tst-efgcvt-template.c +++ b/misc/tst-efgcvt-template.c @@ -200,8 +200,8 @@ special (void) output_error (NAME (ECVT), INFINITY, 10, "inf", 0, 0, p, decpt, sign); /* Simply make sure these calls with large NDIGITs don't crash. */ - (void) ECVT (123.456, 10000, &decpt, &sign); - (void) FCVT (123.456, 10000, &decpt, &sign); + p = ECVT (123.456, 10000, &decpt, &sign); + p = FCVT (123.456, 10000, &decpt, &sign); /* Some tests for the reentrant functions. */ /* Use a too small buffer. */ diff --git a/posix/tst-nice.c b/posix/tst-nice.c index fe9888b3f6..59cf953e27 100644 --- a/posix/tst-nice.c +++ b/posix/tst-nice.c @@ -58,8 +58,7 @@ do_test (void) /* BZ #18086. Make sure we don't reset errno. */ errno = EBADF; - nice (0); - if (errno != EBADF) + if (nice (0) == -1 || errno != EBADF) { printf ("FAIL: errno = %i, but wanted EBADF (%i)\n", errno, EBADF); return 1; diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c index 87d537c931..057c89dd3c 100644 --- a/posix/wordexp-test.c +++ b/posix/wordexp-test.c @@ -253,7 +253,11 @@ do_test (int argc, char *argv[]) cwd = getcwd (NULL, 0); /* Set up arena for pathname expansion */ - tmpnam (tmpdir); + if (!tmpnam (tmpdir)) + { + printf ("Failed to create a temporary directory with a unique name: %m"); + return 1; + } xmkdir (tmpdir, S_IRWXU); TEST_VERIFY_EXIT (chdir (tmpdir) == 0); diff --git a/stdio-common/bug19.c b/stdio-common/bug19.c index e083304bda..9a3deac3fc 100644 --- a/stdio-common/bug19.c +++ b/stdio-common/bug19.c @@ -29,12 +29,17 @@ do_test (void) printf("checking sscanf\n"); int i, j, n; + int result = 0; i = j = n = 0; - FSCANF (fp, L(" %i - %i %n"), &i, &j, &n); + if (FSCANF (fp, L(" %i - %i %n"), &i, &j, &n) < 2) + { + printf ("FSCANF couldn't read all parameters %d\n", errno); + result = 1; + } + printf ("found %i-%i (length=%i)\n", i, j, n); - int result = 0; if (i != 7) { printf ("i is %d, expected 7\n", i); diff --git a/stdio-common/bug6.c b/stdio-common/bug6.c index 0db63a3b44..50098bf3f2 100644 --- a/stdio-common/bug6.c +++ b/stdio-common/bug6.c @@ -7,16 +7,16 @@ main (void) int i; int lost = 0; - scanf ("%2s", buf); + lost = (scanf ("%2s", buf) < 0); lost |= (buf[0] != 'X' || buf[1] != 'Y' || buf[2] != '\0'); if (lost) puts ("test of %2s failed."); - scanf (" "); - scanf ("%d", &i); + lost |= (scanf (" ") < 0); + lost |= (scanf ("%d", &i) < 0); lost |= (i != 1234); if (lost) puts ("test of %d failed."); - scanf ("%c", buf); + lost |= (scanf ("%c", buf) < 0); lost |= (buf[0] != 'L'); if (lost) puts ("test of %c failed.\n"); diff --git a/stdio-common/tstscanf.c b/stdio-common/tstscanf.c index 3a4ebf7524..7e92df4720 100644 --- a/stdio-common/tstscanf.c +++ b/stdio-common/tstscanf.c @@ -120,7 +120,12 @@ main (int argc, char **argv) int i; float x; char name[50]; - (void) fscanf (in, "%2d%f%*d %[0123456789]", &i, &x, name); + if (fscanf (in, "%2d%f%*d %[0123456789]", &i, &x, name) < 3) + { + fputs ("test failed!\n", stdout); + result = 1; + } + fprintf (out, "i = %d, x = %f, name = \"%.50s\"\n", i, x, name); if (i != 56 || x != 789.0F || strcmp (name, "56")) { @@ -164,7 +169,12 @@ main (int argc, char **argv) quant = 0.0; units[0] = item[0] = '\0'; count = fscanf (in, "%f%20s of %20s", &quant, units, item); - (void) fscanf (in, "%*[^\n]"); + if (fscanf (in, "%*[^\n]") < 0 && ferror (in)) + { + fputs ("test failed!\n", stdout); + result = 1; + } + fprintf (out, "count = %d, quant = %f, item = %.21s, units = %.21s\n", count, quant, item, units); if (count != ok[rounds-1].count || quant != ok[rounds-1].quant diff --git a/stdlib/test-canon.c b/stdlib/test-canon.c index 5a2e7e1e6e..407ad5c4a2 100644 --- a/stdlib/test-canon.c +++ b/stdlib/test-canon.c @@ -123,8 +123,13 @@ do_test (int argc, char ** argv) int i, errors = 0; char buf[PATH_MAX]; - getcwd (cwd, sizeof (buf)); - cwd_len = strlen (cwd); + if (getcwd (cwd, sizeof (buf))) + cwd_len = strlen (cwd); + else + { + printf ("%s: current working directory couldn't be retrieved\n", argv[0]); + ++errors; + } errno = 0; if (realpath (NULL, buf) != NULL || errno != EINVAL) @@ -210,7 +215,12 @@ do_test (int argc, char ** argv) free (result2); } - getcwd (buf, sizeof (buf)); + if (!getcwd (buf, sizeof (buf))) + { + printf ("%s: current working directory couldn't be retrieved\n", argv[0]); + ++errors; + } + if (strcmp (buf, cwd)) { printf ("%s: current working directory changed from %s to %s\n", diff --git a/support/test-container.c b/support/test-container.c index 37beb778d6..f51afefedb 100644 --- a/support/test-container.c +++ b/support/test-container.c @@ -714,8 +714,8 @@ check_for_unshare_hints (int require_pidns) continue; val = -1; /* Sentinel. */ - fscanf (f, "%d", &val); - if (val != files[i].bad_value) + int cnt = fscanf (f, "%d", &val); + if (cnt == 1 && val != files[i].bad_value) continue; printf ("To enable test-container, please run this as root:\n"); diff --git a/sysdeps/pthread/tst-cancel16.c b/sysdeps/pthread/tst-cancel16.c index 511b9e1e91..d47c7c68cb 100644 --- a/sysdeps/pthread/tst-cancel16.c +++ b/sysdeps/pthread/tst-cancel16.c @@ -50,7 +50,11 @@ tf (void *arg) pthread_cleanup_push (cl, NULL); /* This call should never return. */ - (void) lockf (fd, F_LOCK, 0); + if (lockf (fd, F_LOCK, 0)) + { + puts ("child thread: lockf failed"); + exit (1); + } pthread_cleanup_pop (0); diff --git a/sysdeps/pthread/tst-cancel4.c b/sysdeps/pthread/tst-cancel4.c index 4f5c89314c..4c9e8670ca 100644 --- a/sysdeps/pthread/tst-cancel4.c +++ b/sysdeps/pthread/tst-cancel4.c @@ -1009,7 +1009,8 @@ tf_pread (void *arg) pthread_cleanup_push (cl, NULL); char mem[10]; - pread (tempfd, mem, sizeof (mem), 0); + if (pread (tempfd, mem, sizeof (mem), 0) < 0) + FAIL_EXIT1 ("pread failed: %m"); pthread_cleanup_pop (0); @@ -1038,7 +1039,8 @@ tf_pwrite (void *arg) pthread_cleanup_push (cl, NULL); char mem[10]; - pwrite (tempfd, mem, sizeof (mem), 0); + if (pwrite (tempfd, mem, sizeof (mem), 0) <0) + FAIL_EXIT1 ("pwrite failed: %m"); pthread_cleanup_pop (0);