Skip to content

nftables: Added uint8/16 and int8/16/64 BytesView converters. #12264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nftables: Added uint8/16 and int8/16/64 BytesView converters. #12264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/sentry/socket/netlink/netfilter/protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ func (p *Protocol) addChain(attrs map[uint16]nlmsg.BytesView, tab *nftables.Tabl
return syserr.NewAnnotatedError(syserr.ErrNotSupported, fmt.Sprintf("Nftables: Chain binding attribute is not supported for chains with a hook"))
}

bcInfo, err = p.chainParseHook(nil, family, nlmsg.AttrsView(hookDataBytes))
bcInfo, err = p.chainParseHook(nil, family, nlmsg.AttrsView(hookDataBytes), attrs)
if err != nil {
return err
}
Expand Down Expand Up @@ -494,7 +494,7 @@ func (p *Protocol) addChain(attrs map[uint16]nlmsg.BytesView, tab *nftables.Tabl

// chainParseHook parses the hook attributes and returns a complete
// BaseChainInfo.
func (p *Protocol) chainParseHook(chain *nftables.Chain, family stack.AddressFamily, hdata nlmsg.AttrsView) (*nftables.BaseChainInfo, *syserr.AnnotatedError) {
func (p *Protocol) chainParseHook(chain *nftables.Chain, family stack.AddressFamily, hdata nlmsg.AttrsView, attrs map[uint16]nlmsg.BytesView) (*nftables.BaseChainInfo, *syserr.AnnotatedError) {
hookAttrs, ok := nftables.NfParse(hdata)
if !ok {
return nil, syserr.NewAnnotatedError(syserr.ErrInvalidArgument, fmt.Sprintf("Nftables: Failed to parse hook attributes"))
Expand Down Expand Up @@ -530,7 +530,7 @@ func (p *Protocol) chainParseHook(chain *nftables.Chain, family stack.AddressFam
// All families default to filter type.
hookInfo.ChainType = nftables.BaseChainTypeFilter

if chainTypeBytes, ok := hookAttrs[linux.NFTA_CHAIN_TYPE]; ok {
if chainTypeBytes, ok := attrs[linux.NFTA_CHAIN_TYPE]; ok {
// TODO - b/434243967: Support base chain types other than filter.
switch chainType := chainTypeBytes.String(); chainType {
case "filter":
Expand Down
55 changes: 55 additions & 0 deletions pkg/sentry/socket/netlink/nlmsg/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,28 @@ func (v *BytesView) String() string {
return string(b)
}

// Uint8 converts the raw attribute value to uint8.
func (v *BytesView) Uint8() (uint8, bool) {
attr := []byte(*v)
val := primitive.Uint8(0)
if len(attr) != val.SizeBytes() {
return 0, false
}
val.UnmarshalBytes(attr)
return uint8(val), true
}

// Uint16 converts the raw attribute value to uint16.
func (v *BytesView) Uint16() (uint16, bool) {
attr := []byte(*v)
val := primitive.Uint16(0)
if len(attr) != val.SizeBytes() {
return 0, false
}
val.UnmarshalBytes(attr)
return uint16(val), true
}

// Uint32 converts the raw attribute value to uint32.
func (v *BytesView) Uint32() (uint32, bool) {
attr := []byte(*v)
Expand All @@ -396,6 +418,28 @@ func (v *BytesView) Uint64() (uint64, bool) {
return uint64(val), true
}

// Int8 converts the raw attribute value to int8.
func (v *BytesView) Int8() (int8, bool) {
attr := []byte(*v)
val := primitive.Int8(0)
if len(attr) != val.SizeBytes() {
return 0, false
}
val.UnmarshalBytes(attr)
return int8(val), true
}

// Int16 converts the raw attribute value to int32.
func (v *BytesView) Int16() (int16, bool) {
attr := []byte(*v)
val := primitive.Int16(0)
if len(attr) != val.SizeBytes() {
return 0, false
}
val.UnmarshalBytes(attr)
return int16(val), true
}

// Int32 converts the raw attribute value to int32.
func (v *BytesView) Int32() (int32, bool) {
attr := []byte(*v)
Expand All @@ -407,6 +451,17 @@ func (v *BytesView) Int32() (int32, bool) {
return int32(val), true
}

// Int64 converts the raw attribute value to int32.
func (v *BytesView) Int64() (int64, bool) {
attr := []byte(*v)
val := primitive.Int64(0)
if len(attr) != val.SizeBytes() {
return 0, false
}
val.UnmarshalBytes(attr)
return int64(val), true
}

// NetToHostU16 converts a uint16 in network byte order to
// host byte order value.
func NetToHostU16(v uint16) uint16 {
Expand Down
22 changes: 11 additions & 11 deletions test/syscalls/linux/socket_netlink_netfilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,6 @@ TEST(NetlinkNetfilterTest, ErrNewBaseChainWithInvalidPolicy) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_table_request_buffer =
Expand All @@ -955,6 +954,7 @@ TEST(NetlinkNetfilterTest, ErrNewBaseChainWithInvalidPolicy) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 5)
Expand Down Expand Up @@ -1122,7 +1122,6 @@ TEST(NetlinkNetfilterTest, ErrNewBaseChainWithInvalidChainType) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -1139,6 +1138,7 @@ TEST(NetlinkNetfilterTest, ErrNewBaseChainWithInvalidChainType) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 3)
Expand Down Expand Up @@ -1167,7 +1167,6 @@ TEST(NetlinkNetfilterTest, ErrNewNATBaseChainWithInvalidPriority) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -1184,6 +1183,7 @@ TEST(NetlinkNetfilterTest, ErrNewNATBaseChainWithInvalidPriority) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 3)
Expand Down Expand Up @@ -1212,7 +1212,6 @@ TEST(NetlinkNetfilterTest, ErrUnsupportedNewNetDevBaseChain) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -1229,6 +1228,7 @@ TEST(NetlinkNetfilterTest, ErrUnsupportedNewNetDevBaseChain) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 3)
Expand Down Expand Up @@ -1257,7 +1257,6 @@ TEST(NetlinkNetfilterTest, ErrUnsupportedNewInetBaseChainAtIngress) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -1274,6 +1273,7 @@ TEST(NetlinkNetfilterTest, ErrUnsupportedNewInetBaseChainAtIngress) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 3)
Expand Down Expand Up @@ -1302,7 +1302,6 @@ TEST(NetlinkNetfilterTest, ErrUnsupportedNewBaseChainWithChainCounters) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -1319,6 +1318,7 @@ TEST(NetlinkNetfilterTest, ErrUnsupportedNewBaseChainWithChainCounters) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.RawAttr(NFTA_CHAIN_COUNTERS, nullptr, 0)
.Build())
Expand Down Expand Up @@ -1540,7 +1540,6 @@ TEST(NetlinkNetfilterTest, AddBaseChainWithDropPolicy) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -1557,6 +1556,7 @@ TEST(NetlinkNetfilterTest, AddBaseChainWithDropPolicy) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 3)
Expand Down Expand Up @@ -1787,7 +1787,6 @@ TEST(NetlinkNetfilterTest, GetBaseChain) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -1804,6 +1803,7 @@ TEST(NetlinkNetfilterTest, GetBaseChain) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.RawAttr(NFTA_CHAIN_USERDATA, test_user_data,
expected_udata_size)
Expand Down Expand Up @@ -1857,7 +1857,6 @@ TEST(NetlinkNetfilterTest, ErrDeleteChainWithNoTableNameSpecified) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -1874,6 +1873,7 @@ TEST(NetlinkNetfilterTest, ErrDeleteChainWithNoTableNameSpecified) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 3)
Expand Down Expand Up @@ -1984,7 +1984,6 @@ TEST(NetlinkNetfilterTest, DeleteBaseChain) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -2001,6 +2000,7 @@ TEST(NetlinkNetfilterTest, DeleteBaseChain) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 3)
Expand Down Expand Up @@ -2041,7 +2041,6 @@ TEST(NetlinkNetfilterTest, DeleteBaseChainByHandle) {
NlNestedAttr()
.U32Attr(NFTA_HOOK_HOOKNUM, test_hook_num)
.U32Attr(NFTA_HOOK_PRIORITY, test_hook_priority)
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.Build();

std::vector<char> add_request_buffer =
Expand All @@ -2058,6 +2057,7 @@ TEST(NetlinkNetfilterTest, DeleteBaseChainByHandle) {
.U32Attr(NFTA_CHAIN_POLICY, test_policy)
.RawAttr(NFTA_CHAIN_HOOK, nested_hook_data.data(),
nested_hook_data.size())
.StrAttr(NFTA_CHAIN_TYPE, test_chain_type_name)
.U32Attr(NFTA_CHAIN_FLAGS, test_chain_flags)
.Build())
.SeqEnd(kSeq + 3)
Expand Down