netfilter: nf_tables: set element extended ACK reporting support

commit b53c116642502b0c85ecef78bff4f826a7dd4145 upstream.

Report the element that causes problems via netlink extended ACK for set
element commands.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 6e4ce511f51bab9cac21bdb32fe1545d964ed26b..95c28893002e3a896f252e48eb8972e3bbc36d28 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5769,8 +5769,10 @@ static int nf_tables_getsetelem(struct sk_buff *skb,
 
        nla_for_each_nested(attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS], rem) {
                err = nft_get_set_elem(&ctx, set, attr);
-               if (err < 0)
+               if (err < 0) {
+                       NL_SET_BAD_ATTR(extack, attr);
                        break;
+               }
        }
 
        return err;
@@ -6589,8 +6591,10 @@ static int nf_tables_newsetelem(struct sk_buff *skb,
 
        nla_for_each_nested(attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS], rem) {
                err = nft_add_set_elem(&ctx, set, attr, info->nlh->nlmsg_flags);
-               if (err < 0)
+               if (err < 0) {
+                       NL_SET_BAD_ATTR(extack, attr);
                        return err;
+               }
        }
 
        if (nft_net->validate_state == NFT_VALIDATE_DO)
@@ -6866,8 +6870,10 @@ static int nf_tables_delsetelem(struct sk_buff *skb,
 
        nla_for_each_nested(attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS], rem) {
                err = nft_del_setelem(&ctx, set, attr);
-               if (err < 0)
+               if (err < 0) {
+                       NL_SET_BAD_ATTR(extack, attr);
                        break;
+               }
        }
        return err;
 }