From 6b1bb9a978297aee15d53e31b5723972aa8bb7ed Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 19 May 2020 11:15:30 +0200 Subject: [RHEL7.9 net 1/2] nfnl_osf: Fix broken conversion to nfnl_query() Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1829820 Upstream Status: iptables commit c8332553caf48 commit c8332553caf48132403895bae750b3cd09a2efd8 Author: Phil Sutter Date: Sat May 9 13:36:49 2020 +0200 nfnl_osf: Fix broken conversion to nfnl_query() Due to missing NLM_F_ACK flag in request, nfnetlink code in kernel didn't create an own ACK message but left it upon subsystem to ACK or not. Since nfnetlink_osf doesn't ACK by itself, nfnl_query() got stuck waiting for a reply. Whoever did the conversion from deprecated nfnl_talk() obviously didn't even test basic functionality of the tool. Fixes: 52aa15098ebd6 ("nfnl_osf: Replace deprecated nfnl_talk() by nfnl_query()") Signed-off-by: Phil Sutter Signed-off-by: Phil Sutter --- utils/nfnl_osf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/nfnl_osf.c b/utils/nfnl_osf.c index 9a9fbe1268155..d726e0a6f1cf9 100644 --- a/utils/nfnl_osf.c +++ b/utils/nfnl_osf.c @@ -375,9 +375,11 @@ static int osf_load_line(char *buffer, int len, int del) memset(buf, 0, sizeof(buf)); if (del) - nfnl_fill_hdr(nfnlssh, nmh, 0, AF_UNSPEC, 0, OSF_MSG_REMOVE, NLM_F_REQUEST); + nfnl_fill_hdr(nfnlssh, nmh, 0, AF_UNSPEC, 0, OSF_MSG_REMOVE, + NLM_F_ACK | NLM_F_REQUEST); else - nfnl_fill_hdr(nfnlssh, nmh, 0, AF_UNSPEC, 0, OSF_MSG_ADD, NLM_F_REQUEST | NLM_F_CREATE); + nfnl_fill_hdr(nfnlssh, nmh, 0, AF_UNSPEC, 0, OSF_MSG_ADD, + NLM_F_ACK | NLM_F_REQUEST | NLM_F_CREATE); nfnl_addattr_l(nmh, sizeof(buf), OSF_ATTR_FINGER, &f, sizeof(struct xt_osf_user_finger)); -- 2.26.2