netlink: don't bug on unknown events
Pablo Neira Ayuso
maintainerPATCH 1/1 netlink: don't bug on unknown events
We will likely have new ones in the future, silently skip them. If the user wants to see them, it just needs to upgrade.
This is currently causing us problems with kernels that deliver the generation counter event.
term1# nft add table test
term2# nft monitor
nft: netlink.c:2063: netlink_events_cb: Assertion `0' failed. Aborted
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/netlink.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
src/netlink.c +1 -4
@@ -2030,7 +2030,7 @@ static void netlink_events_cache_update(struct netlink_mon_handler *monh,static int netlink_events_cb (const struct nlmsghdr *nlh,void *data) {int ret =MNL_CB_OK ; -int type = nlh->nlmsg_type &0xFF ; +uint16_t type =NFNL_MSG_TYPE (nlh->nlmsg_type);struct netlink_mon_handler *monh = (struct netlink_mon_handler *)data;netlink_events_cache_update (monh, nlh, type);
@@ -2059,9 +2059,6 @@ static int netlink_events_cb(const struct nlmsghdr *nlh, void *data)case NFT_MSG_DELRULE : ret =netlink_events_rule_cb (nlh, type, monh);break ; -default : -BUG ("Unknow event received from netlink.\n" ); -break ; }return ret;
Signature · 1 line
1.7.10.4