Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ab0b245 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nfnetlink_acct: fix nfnl_acct_get operation 



The get operation was not sending the message that was built to
user-space. This patch also includes the appropriate handling for
the return value of netlink_unicast().

Moreover, fix error codes on error (for example, for non-existing
entry was uncorrect).

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent b236916a

net/netfilter/nfnetlink_acct.c

+13 −4
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int 
nfnl_acct_get(struct sock *nfnl, struct sk_buff *skb,

	     const struct nlmsghdr *nlh, const struct nlattr * const tb[])

{

	int ret = 0;

	int ret = -ENOENT;

	struct nf_acct *cur;

	char *acct_name;
@@ -186,18 +186,27 @@ nfnl_acct_get(struct sock *nfnl, struct sk_buff *skb, 
			continue;



		skb2 = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

		if (skb2 == NULL)

		if (skb2 == NULL) {

			ret = -ENOMEM;

			break;

		}



		ret = nfnl_acct_fill_info(skb2, NETLINK_CB(skb).pid,

					 nlh->nlmsg_seq,

					 NFNL_MSG_TYPE(nlh->nlmsg_type),

					 NFNL_MSG_ACCT_NEW, cur);

		if (ret <= 0)

		if (ret <= 0) {

			kfree_skb(skb2);



			break;

		}

		ret = netlink_unicast(nfnl, skb2, NETLINK_CB(skb).pid,

					MSG_DONTWAIT);

		if (ret > 0)

			ret = 0;



		/* this avoids a loop in nfnetlink. */

		return ret == -EAGAIN ? -ENOBUFS : ret;

	}

	return ret;

}