Page MenuHomeFreeBSD
Differential D21812

ipfw(8): When checking for IPv4 in add_src() and add_dat(), don't assume !IPv6 is IPv4
AbandonedPublic
Actions

Authored by nc on Sep 26 2019, 10:07 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 28, 12:19 AM
Unknown Object (File)
Feb 18 2024, 2:09 PM
Unknown Object (File)
Dec 23 2023, 9:13 PM
Unknown Object (File)
Dec 22 2023, 10:54 PM
Unknown Object (File)
Dec 22 2023, 3:44 AM
Unknown Object (File)
Dec 10 2023, 11:36 PM
Unknown Object (File)
Dec 6 2023, 5:37 PM
Unknown Object (File)
Dec 2 2023, 2:33 PM
View All 49 Files
Subscribers
driesm
imp
Contributor Reviews (src)

Details

Reviewers
ae
melifaro
Group Reviewers
manpages
Commits
rS358858: Don't assume !IPv6 is IPv4 in ipfw(8) add_src() and add_dst().
Summary

When checking for IPv4 in add_src() and add_dat(), don't assume !IPv6 is IPv4. Revised patch which also takes the "any" operator into account.

Also, switch to if...else if statements.

Submitted by: Neel Chauhan <neel AT neelc DOT org>

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

nc created this revision.Sep 26 2019, 10:07 PM
Herald added subscribers: Contributor Reviews (src), imp. · View Herald TranscriptSep 26 2019, 10:07 PM
lwhsu added a reviewer: ae.Oct 22 2019, 9:38 AM
nc retitled this revision from ipfw(8): Check for IPv4 in add_src() and add_dat, don't assume !IPv6 is IPv4 to ipfw(8): When checking for IPv4 in add_src() and add_dat(), don't assume !IPv6 is IPv4.Dec 23 2019, 11:52 PM
nc edited the summary of this revision. (Show Details)
nc updated this revision to Diff 67081.Jan 21 2020, 4:38 AM
Herald added a reviewer: manpages. · View Herald TranscriptJan 21 2020, 4:38 AM
nc updated this revision to Diff 67087.Jan 21 2020, 4:43 AM
ae added a reviewer: melifaro.Jan 23 2020, 12:10 PM
melifaro added a comment.Jan 24 2020, 8:50 PM

LGTM.

Could you please consider avoiding putting the diffs without the context next time?

sbin/ipfw/ipfw2.c
3750

Why not if .. else if .. else if pattern?

nc updated this revision to Diff 67648.Feb 2 2020, 12:30 AM
nc edited the summary of this revision. (Show Details)
nc marked an inline comment as done.
melifaro accepted this revision.Feb 13 2020, 6:49 PM
This revision is now accepted and ready to land.Feb 13 2020, 6:49 PM
Closed by commit rS358858: Don't assume !IPv6 is IPv4 in ipfw(8) add_src() and add_dst(). (authored by melifaro). · Explain WhyMar 10 2020, 8:30 PM
This revision was automatically updated to reflect the committed changes.
melifaro added a commit: rS358858: Don't assume !IPv6 is IPv4 in ipfw(8) add_src() and add_dst()..
driesm added a subscriber: driesm.Mar 10 2020, 9:31 PM
melifaro reopened this revision.Mar 11 2020, 8:12 AM

In the current state, it breaks rules with "any" keyword specified as a destination.
Could you please add atf-based tests on the proposed changes?

nc added a comment.Mar 11 2020, 3:35 PM

The issue is the use of "strcmp(av, "any") != 0" which should be "strcmp(av, "any") == 0"

I opened a new revision to fix the issue at D24025.

nc updated this revision to Diff 69424.Mar 12 2020, 3:15 PM
nc edited the summary of this revision. (Show Details)

This patch should fix the "any" use case.

nc added a comment.Mar 14 2020, 5:12 PM

About the atf-sh tests, I can write them. Let's first commit D24021 since there will be a merge conflict with the two.

nc abandoned this revision.Mar 14 2020, 7:54 PM

I'm merging this effort with D24021.

nc mentioned this in D24021: ipfw: Add me4 as to refer to an host's IPv4 address in add_src() and add_dst()..Mar 14 2020, 9:12 PM

Revision Contents
Changeset List

PathSize
sbin/
ipfw/
14 lines

Diff 67648

View Options

sbin/ipfw/ipfw2.c

Loading...