Differential D1191

Eliminate ipfilter crash when VIMAGE is enabled in kernel
ClosedPublic
Actions

Authored by • rodrigc on Nov 19 2014, 9:33 AM.

Details

Reviewers

Group Reviewers

network

Commits

rS275741: Merge r275213.
rS275213: MFC r274744.
rS274744: Set the current vnet inside the ioctl handler for ipfilter.

Summary

Set the current vnet inside the ioctl handler for ipfilter.

Without this fix, the vnet was NULL and would crash.
This fix is similar to what was done inside the ioctl handler for PF.

PR: 176992

Test Plan

(1) Boot a kernel with "options VIMAGE" enabled
(2) Type:

echo "map lo0 from 10.0.0.0/24 to ! 10.0.0.0/24 -> 127.0.0.1/32" > /etc/ipnat.rules ; service ipnat onerestart

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

• rodrigc updated this revision to Diff 2456.Nov 19 2014, 9:33 AM

• rodrigc retitled this revision from to Eliminate ipfilter crash when VIMAGE is enabled in kernel.

• rodrigc updated this object.

• rodrigc edited the test plan for this revision. (Show Details)

• rodrigc added reviewers: network, cy.

Looks good. Tested here, works.

This revision is now accepted and ready to land.Nov 20 2014, 2:23 AM

Closed by commit rS274744 (authored by @rodrigc).

I'd argue that there is no need for the #ifs as there is no supported FreeBSD version before 8 anyway anymore.

Otherwise that's ok I'd say.

Revision Contents
Changeset List

Path

Size

head/

sys/

contrib/

ipfilter/

netinet/

ip_fil_freebsd.c

11 lines

Diff 2472

View Options

head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c

Eliminate ipfilter crash when VIMAGE is enabled in kernelClosedPublicActions