ipfw: Update the pfil mbuf pointer in ipfw_check_frame()
ClosedPublic
Actions

Authored by markj on Jun 14 2021, 9:42 PM.

Details

Reviewers

glebius
ae

Commits

rGbc6a2267fffe: ipfw: Update the pfil mbuf pointer in ipfw_check_frame()

Summary

ipfw_chk() might call m_pullup() and thus can change the mbuf chain
head. In this case, the new chain head has to be returned to the pfil
hook caller.

PR: 256439
Fixes: f355cb3e6
MFC after: 3 days

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj created this revision.Jun 14 2021, 9:42 PM

Herald added subscribers: donner, melifaro, imp. · View Herald TranscriptJun 14 2021, 9:42 PM

markj requested review of this revision.Jun 14 2021, 9:42 PM

Harbormaster completed remote builds in B39909: Diff 90895.Jun 14 2021, 9:42 PM

I think we can set *p.m unconditionally, like we do in ipfw_check_packet().

This revision is now accepted and ready to land.Jun 15 2021, 11:21 AM

In D30764#691796, @ae wrote:

I think we can set *p.m unconditionally, like we do in ipfw_check_packet().

p is a union of struct mbuf ** and void *. So wouldn't setting *p.m do the wrong thing if the packet is passed with PFIL_MEMPTR?

In D30764#691856, @markj wrote:

p is a union of struct mbuf ** and void *. So wouldn't setting *p.m do the wrong thing if the packet is passed with PFIL_MEMPTR?

You are right.

Closed by commit rGbc6a2267fffe: ipfw: Update the pfil mbuf pointer in ipfw_check_frame() (authored by markj). · Explain WhyJun 16 2021, 2:02 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rGbc6a2267fffe: ipfw: Update the pfil mbuf pointer in ipfw_check_frame().