Commit 2214ca1f authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

mpls: Return early in mpls_label_ok(). 



When mpls_label_ok() returns false, it does not need to update *index.

Let's remove is_ok and return early.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: default avatarGuillaume Nault <gnault@redhat.com>
Link: https://patch.msgid.link/20251029173344.2934622-2-kuniyu@google.com


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

net/mpls/af_mpls.c

+5 −6
Original line number Diff line number Diff line
@@ -940,24 +940,23 @@ static int mpls_nh_build_multi(struct mpls_route_config *cfg, 
static bool mpls_label_ok(struct net *net, unsigned int *index,

			  struct netlink_ext_ack *extack)

{

	bool is_ok = true;



	/* Reserved labels may not be set */

	if (*index < MPLS_LABEL_FIRST_UNRESERVED) {

		NL_SET_ERR_MSG(extack,

			       "Invalid label - must be MPLS_LABEL_FIRST_UNRESERVED or higher");

		is_ok = false;

		return false;

	}



	/* The full 20 bit range may not be supported. */

	if (is_ok && *index >= net->mpls.platform_labels) {

	if (*index >= net->mpls.platform_labels) {

		NL_SET_ERR_MSG(extack,

			       "Label >= configured maximum in platform_labels");

		is_ok = false;

		return false;

	}



	*index = array_index_nospec(*index, net->mpls.platform_labels);

	return is_ok;



	return true;

}



static int mpls_route_add(struct mpls_route_config *cfg,