pfctl: Fix superblock printf format mismatch
ClosedPublic
Actions

Authored by vegeta_tuxpowered.net on Mar 5 2023, 8:37 PM.

Details

Reviewers

Group Reviewers

network

Commits

rG9f1beeaed4d5: pfctl: fix superblock printf format mismatch

Summary

It is impossible to compile pfctl with OPT_DEBUG due to integer width mismatch:

/usr/home/kajetan.staszkiewicz/freebsd.git/sbin/pfctl/pfctl_optimize.c:1479:9: error: format specifies type 'unsigned int' but the argument has type 'unsigned long' [-Werror,-Wformat]
                                    i - pf_rule_desc[closest].prf_off--- pfctl_optimize.o ---
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/home/kajetan.staszkiewicz/freebsd.git/sbin/pfctl/pfctl_optimize.c:52:44: note: expanded from macro 'DEBUG'
        printf("%s: " str "\n", __FUNCTION__ , ## v)
                      ~~~                         ^
1 error generated.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

vegeta_tuxpowered.net created this revision.Mar 5 2023, 8:37 PM

Herald added a subscriber: imp. · View Herald TranscriptMar 5 2023, 8:37 PM

vegeta_tuxpowered.net requested review of this revision.Mar 5 2023, 8:37 PM

Just as a reference, here is OpenBSD's commit:
https://github.com/openbsd/src/commit/0c54afce7b19bf1867acebc6219af5943ce387c3

ok, in this case commit message should reference openbsd, like so: "Obtained from: OpenBSD (pfctl_optimize.c 1.15)"

With the patch that seems to fail to build on armv6 (and I suspect on i386 as well):

/usr/src/sbin/pfctl/pfctl_optimize.c:1482:9: error: format specifies type 'unsigned long' but the argument has type 'unsigned int' [-Werror,-Wformat]
                                    i - pf_rule_desc[closest].prf_off^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/src/sbin/pfctl/pfctl_optimize.c:52:44: note: expanded from macro 'DEBUG'
        printf("%s: " str "\n", __FUNCTION__ , ## v)
                      ~~~                         ^
1 error generated.
*** [pfctl_optimize.o] Error code 1

I believe we want %zxh, because 'z' is specifically intended to print size_t, whereas 'l' implies an unsigned long, which isn't always what size_t is.
I've kicked off another make universe with z rather than l.

kp added reviewers: kp, network.Mar 6 2023, 3:02 PM

This revision was not accepted when it landed; it landed in state Needs Review.Mar 6 2023, 7:27 PM

Closed by commit rG9f1beeaed4d5: pfctl: fix superblock printf format mismatch (authored by vegeta_tuxpowered.net, committed by kp). · Explain Why

This revision was automatically updated to reflect the committed changes.

kp added a commit: rG9f1beeaed4d5: pfctl: fix superblock printf format mismatch.