From nobody Fri Feb 25 15:31:05 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1D54519CC634; Fri, 25 Feb 2022 15:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K4tyy0Lwhz4Wdy; Fri, 25 Feb 2022 15:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645803066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBh3zDq++YXGEJiNARb4QA/8JxL+TBjdgWHXmuLhW7o=; b=NGd1sM6ligtAV9BVLTeZmzzUIaEhPw/T635QozaPBdaq2f9/zYsLr0HgO5TlKDR+UmhpBm k1prCwtwRI5I7KskXNI3n20OZt22PJAME2bpBRmz/JovQjS62+pTLUSoNwgy4zUXptzDiv lKXnHAFRhrVakdPNgty/BkTF/X10ikorkgBT41xrrT6xyDO+xxv0r+EArGr8qfF2goUS8o I7YfsWTBlaDlCILw3JG0S0BIJy/zdD4v0Dk1Gy37f2RR8h/U2G5Xf0pbbJkI6lJxEMs/vU 7iysxcZO1QAK5wDbDJym2WjhAhzT7ohF8G4VfG1Flod/wla4iJf4znb35a+5UA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E15A821CCB; Fri, 25 Feb 2022 15:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21PFV57D076219; Fri, 25 Feb 2022 15:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PFV5AB076218; Fri, 25 Feb 2022 15:31:05 GMT (envelope-from git) Date: Fri, 25 Feb 2022 15:31:05 GMT Message-Id: <202202251531.21PFV5AB076218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: a2a8efb4f6c1 - main - rtsold: Use correct error in llflags_get() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2a8efb4f6c15ad0880167cb22452e50aaacf52f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645803066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBh3zDq++YXGEJiNARb4QA/8JxL+TBjdgWHXmuLhW7o=; b=Ldg1TtbXZ1jsXjD9JAruFl7tSYM8obXESF4YWjNBMUse48sHtw10q9nQ2458UJBEuCXEhD 87oeOmGKJSkwBs3l1Tm9QK2gq/B/w+aqQRZrXA17RLoHVCzB98o5FlFdjwjKzxylqHRt1n TSwQUgMfmehW+rcfwW1WPevwaUVgqHLKXEAZdD+cmJcVTue9Lj4IC+JJA40n3KIx30QVst jk9F3MMQCmPQH8oL7G8nSnB9JPNGlh5HuBsBU2DOALrCFPqV8fbyGElSWnPknbKXbqIT2K sOPVJjClV4DxFcFLyEme+hVtEUFAnysGLTNGO27OxSmZLOF9Gcgq74CUDQ+V7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645803066; a=rsa-sha256; cv=none; b=F4/gKk3Fy6+QqzAWcZl4qEA+KtUt7MSMfAYl2h/UFIR1cv1V1P+H3XfVRhyG49sRsVrW+G Uyqo9IwUihRpm7UZveH2X9fNvAFUkZ8mccnoAW35wZrBx0FPphu5aeVcidyCBRFXYmAT0+ +LLxhELS49xwAQWMhoMcLlhS6d3RZnUfaPscHkwirx5YDiboN+VOl4yVhfmduGIeVLQYy2 R5ZDLbW0evZ5HcOzLBTD5mQ0vRiJdok94N5JS3gScKV5CPQkzHp5BZzGBt+kT/iX/mO0Na tMe4zhXeVI2XfJDscpYMLK7vNfTb6zt7uPIj+KlbH7TfUzAaguHctmpN3fQnJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=a2a8efb4f6c15ad0880167cb22452e50aaacf52f commit a2a8efb4f6c15ad0880167cb22452e50aaacf52f Author: Eric van Gyzen AuthorDate: 2022-02-23 16:29:53 +0000 Commit: Eric van Gyzen CommitDate: 2022-02-25 15:30:29 +0000 rtsold: Use correct error in llflags_get() Set errno to EINVAL if the name overflows the buffer, as was done before commit ecce515d54bc. Reviewed by: dab, markj Fixes: ecce515d54bcea54fea03f731aad646c87761d22 MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D34354 --- usr.sbin/rtsold/cap_llflags.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/rtsold/cap_llflags.c b/usr.sbin/rtsold/cap_llflags.c index 195f83893b4d..aea45d9fb8a0 100644 --- a/usr.sbin/rtsold/cap_llflags.c +++ b/usr.sbin/rtsold/cap_llflags.c @@ -91,7 +91,7 @@ llflags_get(const char *ifname, int *flagsp) memset(&ifr6, 0, sizeof(ifr6)); if (strlcpy(ifr6.ifr_name, ifname, sizeof(ifr6.ifr_name)) >= sizeof(ifr6.ifr_name)) { - error = errno; + error = EINVAL; goto out; } memcpy(&ifr6.ifr_ifru.ifru_addr, sin6, sin6->sin6_len);