From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A4702EE26E; Tue, 17 Jun 2025 16:19:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750177179; cv=none; b=G4uxmFaYq7fmKEjAuPrdaIYxIEKtPBz8l3XhY3BPVd0hzfTLat9CJzdz1RF6aO1S+wh1OuW4baLZ0ujvGFjmt9O5TqfXihyBY85chxKoDAtAq4xX+9hgIw+Y8Ntn03r9ddVpFU6hbL6BP4LHyGQfD3hl3AJsNgAESPDdc8gEGBg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750177179; c=relaxed/simple; bh=nKyZ3lLtZcstYRDbjWccln1OattIEoo2b72AEMGlrN4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+q4/yt/w4lxvLjCze3U6UBoywJYsbmdJOY2vd9FM3KW+oRm7FhP05ENHfp2ao+Jjp3dXlEGM9dklIC7D2KWeyMYrAG2FDwAvP9BHzIe2JYEpeSSmlCmzcDD322wJhEY8FF7v6hyc5OY8m3Yx1PS3vIFINeKGGcKikoaHXa+P+E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yrlLhzC3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yrlLhzC3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F6C0C4CEE3; Tue, 17 Jun 2025 16:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750177179; bh=nKyZ3lLtZcstYRDbjWccln1OattIEoo2b72AEMGlrN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yrlLhzC3ffVU1wDwHxcf2jXyz+PUPb9Ir6gvC2g11f40HEltibXLhafD9CKu9gm9G cGuYuxGs8pXNxYSvr0mhNJRXiM73MyFhow1wA3Y5dEpHGz1bKLd+/OhcOIu7z9As28 jMQSHiWhR0PIEqoJ3JybadeOV5OYbWoU2QT0y5pc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andrii Nakryiko , Anton Protopopov , Sasha Levin Subject: [PATCH 6.15 259/780] libbpf: Use proper errno value in nlattr Date: Tue, 17 Jun 2025 17:19:27 +0200 Message-ID: <20250617152502.004616222@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152451.485330293@linuxfoundation.org> References: <20250617152451.485330293@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Anton Protopopov [ Upstream commit fd5fd538a1f4b34cee6823ba0ddda2f7a55aca96 ] Return value of the validate_nla() function can be propagated all the way up to users of libbpf API. In case of error this libbpf version of validate_nla returns -1 which will be seen as -EPERM from user's point of view. Instead, return a more reasonable -EINVAL. Fixes: bbf48c18ee0c ("libbpf: add error reporting in XDP") Suggested-by: Andrii Nakryiko Signed-off-by: Anton Protopopov Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20250510182011.2246631-1-a.s.protopopov@gmail.com Signed-off-by: Sasha Levin --- tools/lib/bpf/nlattr.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/lib/bpf/nlattr.c b/tools/lib/bpf/nlattr.c index 975e265eab3bf..06663f9ea581f 100644 --- a/tools/lib/bpf/nlattr.c +++ b/tools/lib/bpf/nlattr.c @@ -63,16 +63,16 @@ static int validate_nla(struct nlattr *nla, int maxtype, minlen = nla_attr_minlen[pt->type]; if (libbpf_nla_len(nla) < minlen) - return -1; + return -EINVAL; if (pt->maxlen && libbpf_nla_len(nla) > pt->maxlen) - return -1; + return -EINVAL; if (pt->type == LIBBPF_NLA_STRING) { char *data = libbpf_nla_data(nla); if (data[libbpf_nla_len(nla) - 1] != '\0') - return -1; + return -EINVAL; } return 0; @@ -118,19 +118,18 @@ int libbpf_nla_parse(struct nlattr *tb[], int maxtype, struct nlattr *head, if (policy) { err = validate_nla(nla, maxtype, policy); if (err < 0) - goto errout; + return err; } - if (tb[type]) + if (tb[type]) { pr_warn("Attribute of type %#x found multiple times in message, " "previous attribute is being ignored.\n", type); + } tb[type] = nla; } - err = 0; -errout: - return err; + return 0; } /** -- 2.39.5