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

Commit ce071832 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netlink_ext_ACK' 



Johannes Berg says:

====================
netlink extended ACK reporting

Changes since v4:
 * use __NLMSGERR_ATTR_MAX instead of NUM_NLMSGERR_ATTRS

Changes since v3:
 * Add NLM_F_CAPPED and NLM_F_ACK_TLVS flags, to allow entirely
   stateless parsing of the ACK messages by looking at the new
   flags. Need to check NLM_F_ACK_TLVS first, since capping can
   be done in kernels before this patchset without setting the
   flag.
 * Remove "missing_attr" functionality - this can obviously be
   added back rather easily, but I'd rather have more discussion
   about the nesting problem there.
 * Improve documentation of NLMSGERR_ATTR_OFFS
 * Improve message structure documentation, documenting that the
   request message is always capped for success cases
 * fix nlmsg_len of the outer message by calling nlmsg_end()
 * fix memcpy() of the request in success cases, going back to
   the original code that I'd changed before due to the payload
   adjustments that I reverted when introducing tlvlen

Changes since v2:
 * add NUM_NLMSGERR_ATTRS, NLMSGERR_ATTR_MAX
 * fix cookie length to 20 (sha-1 length)
 * move struct members for cookie to patch 3 where they should be
 * another cleanup suggested by David Ahern

Changes since v1:
 * credit Pablo and Jamal
 * incorporate suggestion from David Ahern
 * fix compilation in decnet
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fb9eb899 fe52145f

crypto/crypto_user.c

+3 −2
Original line number Diff line number Diff line
@@ -483,7 +483,8 @@ static const struct crypto_link { 
	[CRYPTO_MSG_DELRNG	- CRYPTO_MSG_BASE] = { .doit = crypto_del_rng },

};



static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)

static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,

			       struct netlink_ext_ack *extack)

{

	struct nlattr *attrs[CRYPTOCFGA_MAX+1];

	const struct crypto_link *link;
@@ -522,7 +523,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
	}



	err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX,

			  crypto_policy);

			  crypto_policy, extack);

	if (err < 0)

		return err;

drivers/block/drbd/drbd_nla.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int drbd_nla_parse_nested(struct nlattr *tb[], int maxtype, struct nlattr *nla, 


	err = drbd_nla_check_mandatory(maxtype, nla);

	if (!err)

		err = nla_parse_nested(tb, maxtype, nla, policy);

		err = nla_parse_nested(tb, maxtype, nla, policy, NULL);



	return err;

}

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline bool ib_nl_is_good_ip_resp(const struct nlmsghdr *nlh) 
		return false;



	ret = nla_parse(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),

			nlmsg_len(nlh), ib_nl_addr_policy);

			nlmsg_len(nlh), ib_nl_addr_policy, NULL);

	if (ret)

		return false;

drivers/infiniband/core/iwpm_util.c

+4 −2
Original line number Diff line number Diff line
@@ -472,12 +472,14 @@ int iwpm_parse_nlmsg(struct netlink_callback *cb, int policy_max, 
	int ret;

	const char *err_str = "";



	ret = nlmsg_validate(cb->nlh, nlh_len, policy_max-1, nlmsg_policy);

	ret = nlmsg_validate(cb->nlh, nlh_len, policy_max - 1, nlmsg_policy,

			     NULL);

	if (ret) {

		err_str = "Invalid attribute";

		goto parse_nlmsg_error;

	}

	ret = nlmsg_parse(cb->nlh, nlh_len, nltb, policy_max-1, nlmsg_policy);

	ret = nlmsg_parse(cb->nlh, nlh_len, nltb, policy_max - 1,

			  nlmsg_policy, NULL);

	if (ret) {

		err_str = "Unable to parse the nlmsg";

		goto parse_nlmsg_error;

drivers/infiniband/core/netlink.c

+3 −2
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ int ibnl_put_attr(struct sk_buff *skb, struct nlmsghdr *nlh, 
}

EXPORT_SYMBOL(ibnl_put_attr);



static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)

static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,

			struct netlink_ext_ack *extack)

{

	struct ibnl_client *client;

	int type = nlh->nlmsg_type;
@@ -209,7 +210,7 @@ static void ibnl_rcv_reply_skb(struct sk_buff *skb) 
		if (nlh->nlmsg_flags & NLM_F_REQUEST)

			return;



		ibnl_rcv_msg(skb, nlh);

		ibnl_rcv_msg(skb, nlh, NULL);



		msglen = NLMSG_ALIGN(nlh->nlmsg_len);

		if (msglen > skb->len)