Commit 5ef4097e authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

ipv6: Use nlmsg_payload in addrlabel file 



Leverage the new nlmsg_payload() helper to avoid checking for message
size and then reading the nlmsg data.

This changes function ip6addrlbl_valid_get_req() and
ip6addrlbl_valid_dump_req().

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250415-nlmsg_v2-v1-1-a1c75d493fd7@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent da59ceed

net/ipv6/addrlabel.c

+4 −4
Original line number Diff line number Diff line
@@ -473,12 +473,12 @@ static int ip6addrlbl_valid_dump_req(const struct nlmsghdr *nlh, 
{

	struct ifaddrlblmsg *ifal;



	if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifal))) {

	ifal = nlmsg_payload(nlh, sizeof(*ifal));

	if (!ifal) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid header for address label dump request");

		return -EINVAL;

	}



	ifal = nlmsg_data(nlh);

	if (ifal->__ifal_reserved || ifal->ifal_prefixlen ||

	    ifal->ifal_flags || ifal->ifal_index || ifal->ifal_seq) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for address label dump request");
@@ -543,7 +543,8 @@ static int ip6addrlbl_valid_get_req(struct sk_buff *skb, 
	struct ifaddrlblmsg *ifal;

	int i, err;



	if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifal))) {

	ifal = nlmsg_payload(nlh, sizeof(*ifal));

	if (!ifal) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid header for addrlabel get request");

		return -EINVAL;

	}
@@ -552,7 +553,6 @@ static int ip6addrlbl_valid_get_req(struct sk_buff *skb, 
		return nlmsg_parse_deprecated(nlh, sizeof(*ifal), tb,

					      IFAL_MAX, ifal_policy, extack);



	ifal = nlmsg_data(nlh);

	if (ifal->__ifal_reserved || ifal->ifal_flags || ifal->ifal_seq) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for addrlabel get request");

		return -EINVAL;