From nobody Sat Dec 31 12:43:30 2022 X-Original-To: dev-commits-src-branches@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 4Nkhcy3bcdz2nP7W; Sat, 31 Dec 2022 12:43:30 +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 4Nkhcy391Bz4NmZ; Sat, 31 Dec 2022 12:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672490610; 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=0e3LGCug5EKG1KHzAeMTmYr4lcACMSt4txDgTDpRvNE=; b=rd75bmSq2R8ZvNkptg3IepHZfGf0T8mt/VG5MAhCMGmvEGR/CuxuKdQQzxyAP2PiZcMTmF EGVkYV08l0DryKrqXmfQFcH+kZ0qXShlaIYMCS9KhwlKB4EeoZBZbVhdaaxj+lp4gQa3G0 mVRL8t5C/JUrhnI9/gV5gSGmlZF8oZKWRakEBwx8TzSn27NhOviYdHuOCSD3X3LEkY/CHv WF3WGHXggFeUwBO+nOPOuYiGYeFQPYo9fgPjdqEm5Vauv+El2AscP52D5s0GUJRIodTQEI XLSyRqrIcmBJTyuBJlqatd06KWJUPi6krLoFbPYGdlFx6Z6i4/nBWU+CNgpSOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672490610; 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=0e3LGCug5EKG1KHzAeMTmYr4lcACMSt4txDgTDpRvNE=; b=xcNhZ9akw1qwq6kYCdmdBZdM1PzWPq5104yahGDyQSc6b01UvSqarR5guAw+X3s1q+6qzS XmdY/TKixljxP8GLUZzpwUAuqcx6QQZGZxlFL/xOkdYnSLk3ySkZOOA0pIzClb1syjTQuF w7pNVTHoQa64MIhUTlFpQkFtpmyvF9ctpiwHOsSHZCDiXIbOToDum7XIFsZfX0lYSoOaYz iXPu6AIooaF9vlbEo6cWZ7fvKrqBgsZM7YYwyvpZSh368RIRNa+6WJ99/GLWleW/NKwwJp q1wTkuKUQNSUr0eJLF+23TnBeB3Wug9FwFTHmiw1P8v8T7ZkY63OZr511eypog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672490610; a=rsa-sha256; cv=none; b=vs6VSt7ljDeV4EUDLUrVT5sIhUzBg5NbecEOSMjRxQfUW6xk0VPpNCZo3IpVZ1To/CV210 WgzTLW45Bj603V6F063hyVNyW0F2HATqeVIOG8YWvEkRJvgHlVkNkgMG3rs7toeRzCHYNq DHGkNN761CCBPHjaB24Atzj0bFOjQFlDbe75o6qU6ajIPrBO/7wgVV20kw5PG+wDwGFeZn ZnvrKqHOGZBDFpG21Ia7QKDUxAg4+kOPrfD+QXWbqxPfbdxkj2Hb3pHHDTEFOLWpVPjwtK iRWwUYTyF1mBYUbsypp5o7xMEBWgentHEtWnqnC4Xda3DJ8ychO4kiyiltHPLQ== 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 4Nkhcy2GQbzpjb; Sat, 31 Dec 2022 12:43:30 +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 2BVChU2U097634; Sat, 31 Dec 2022 12:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVChUp4097633; Sat, 31 Dec 2022 12:43:30 GMT (envelope-from git) Date: Sat, 31 Dec 2022 12:43:30 GMT Message-Id: <202212311243.2BVChUp4097633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: b4f8bd4de92b - stable/12 - libnetmap: reset errno in nmreq_register_decode() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b4f8bd4de92b8a37bb99adc03c7232665aed6ce6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=b4f8bd4de92b8a37bb99adc03c7232665aed6ce6 commit b4f8bd4de92b8a37bb99adc03c7232665aed6ce6 Author: Vincenzo Maffione AuthorDate: 2021-04-02 14:31:57 +0000 Commit: Vincenzo Maffione CommitDate: 2022-12-31 12:43:08 +0000 libnetmap: reset errno in nmreq_register_decode() The reset is necessary at the beginning of the function, because of the errno logic in the error path (set errno to EINVAL if not set). If errno is already set when calling the function, and the function fails, the previous errno value will be inherited. (cherry picked from commit ab639bb2873034786cd2ec4d2d9c4489fbf6f424) --- lib/libnetmap/nmreq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libnetmap/nmreq.c b/lib/libnetmap/nmreq.c index 7f4b2703d22d..31ddea91f6a5 100644 --- a/lib/libnetmap/nmreq.c +++ b/lib/libnetmap/nmreq.c @@ -257,6 +257,8 @@ nmreq_register_decode(const char **pifname, struct nmreq_register *r, struct nmc uint16_t nr_ringid; uint64_t nr_flags; + errno = 0; + /* fill the request */ p_state = P_START;