Commit 69a1ecfe authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

mpls: Use nlmsg_payload in mpls_valid_getroute_req 



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

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250414-nlmsg-v2-8-3d90cb42c6af@debian.org


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

net/mpls/af_mpls.c

+2 −2
Original line number Diff line number Diff line
@@ -2288,7 +2288,8 @@ static int mpls_valid_getroute_req(struct sk_buff *skb, 
	struct rtmsg *rtm;

	int i, err;



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

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

	if (!rtm) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Invalid header for get route request");

		return -EINVAL;
@@ -2298,7 +2299,6 @@ static int mpls_valid_getroute_req(struct sk_buff *skb, 
		return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,

					      rtm_mpls_policy, extack);



	rtm = nlmsg_data(nlh);

	if ((rtm->rtm_dst_len && rtm->rtm_dst_len != 20) ||

	    rtm->rtm_src_len || rtm->rtm_tos || rtm->rtm_table ||

	    rtm->rtm_protocol || rtm->rtm_scope || rtm->rtm_type) {