From owner-svn-src-head@freebsd.org Tue Oct 27 12:49:42 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D98A44BCE7; Tue, 27 Oct 2020 12:49:42 +0000 (UTC) (envelope-from trasz@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CLBP1738Wz4mJk; Tue, 27 Oct 2020 12:49:41 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D54F1B94A; Tue, 27 Oct 2020 12:49:41 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09RCnfgo030328; Tue, 27 Oct 2020 12:49:41 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09RCnea9030321; Tue, 27 Oct 2020 12:49:40 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202010271249.09RCnea9030321@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 27 Oct 2020 12:49:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367079 - in head/sys: amd64/linux amd64/linux32 arm64/linux compat/linux i386/linux X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head/sys: amd64/linux amd64/linux32 arm64/linux compat/linux i386/linux X-SVN-Commit-Revision: 367079 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Oct 2020 12:49:42 -0000 Author: trasz Date: Tue Oct 27 12:49:40 2020 New Revision: 367079 URL: https://svnweb.freebsd.org/changeset/base/367079 Log: Fix misnomer - linux_to_bsd_errno() does the exact opposite. Reported by: arichardson MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26965 Modified: head/sys/amd64/linux/linux_sysvec.c head/sys/amd64/linux32/linux32_sysvec.c head/sys/arm64/linux/linux_sysvec.c head/sys/compat/linux/linux.h head/sys/compat/linux/linux_errno.c head/sys/compat/linux/linux_socket.c head/sys/i386/linux/linux_sysvec.c Modified: head/sys/amd64/linux/linux_sysvec.c ============================================================================== --- head/sys/amd64/linux/linux_sysvec.c Tue Oct 27 12:44:49 2020 (r367078) +++ head/sys/amd64/linux/linux_sysvec.c Tue Oct 27 12:49:40 2020 (r367079) @@ -231,7 +231,7 @@ linux_set_syscall_retval(struct thread *td, int error) break; default: - frame->tf_rax = linux_to_bsd_errno(error); + frame->tf_rax = bsd_to_linux_errno(error); frame->tf_r10 = frame->tf_rcx; break; } Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Tue Oct 27 12:44:49 2020 (r367078) +++ head/sys/amd64/linux32/linux32_sysvec.c Tue Oct 27 12:49:40 2020 (r367079) @@ -678,7 +678,7 @@ linux32_set_syscall_retval(struct thread *td, int erro if (__predict_false(error != 0)) { if (error != ERESTART && error != EJUSTRETURN) - frame->tf_rax = linux_to_bsd_errno(error); + frame->tf_rax = bsd_to_linux_errno(error); } } Modified: head/sys/arm64/linux/linux_sysvec.c ============================================================================== --- head/sys/arm64/linux/linux_sysvec.c Tue Oct 27 12:44:49 2020 (r367078) +++ head/sys/arm64/linux/linux_sysvec.c Tue Oct 27 12:49:40 2020 (r367079) @@ -142,10 +142,8 @@ linux_set_syscall_retval(struct thread *td, int error) cpu_set_syscall_retval(td, error); if (__predict_false(error != 0)) { - if (error != ERESTART && error != EJUSTRETURN) { - td->td_frame->tf_x[0] = - linux_to_bsd_errno(error); - } + if (error != ERESTART && error != EJUSTRETURN) + td->td_frame->tf_x[0] = bsd_to_linux_errno(error); } } Modified: head/sys/compat/linux/linux.h ============================================================================== --- head/sys/compat/linux/linux.h Tue Oct 27 12:44:49 2020 (r367078) +++ head/sys/compat/linux/linux.h Tue Oct 27 12:49:40 2020 (r367079) @@ -196,6 +196,6 @@ int linux_to_bsd_bits_(int value, struct bsd_to_linux_ } #define BITMAP_1t1_LINUX(_name) BITMAP_EASY_LINUX(_name, LINUX_##_name) -int linux_to_bsd_errno(int error); +int bsd_to_linux_errno(int error); #endif /* _LINUX_MI_H_ */ Modified: head/sys/compat/linux/linux_errno.c ============================================================================== --- head/sys/compat/linux/linux_errno.c Tue Oct 27 12:44:49 2020 (r367078) +++ head/sys/compat/linux/linux_errno.c Tue Oct 27 12:49:40 2020 (r367079) @@ -11,7 +11,7 @@ __FBSDID("$FreeBSD$"); #include int -linux_to_bsd_errno(int error) +bsd_to_linux_errno(int error) { KASSERT(error >= 0 && error <= ELAST, Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Tue Oct 27 12:44:49 2020 (r367078) +++ head/sys/compat/linux/linux_socket.c Tue Oct 27 12:49:40 2020 (r367079) @@ -1559,7 +1559,7 @@ linux_getsockopt(struct thread *td, struct linux_getso name, &newval, UIO_SYSSPACE, &len); if (error != 0) return (error); - newval = -linux_to_bsd_errno(newval); + newval = -bsd_to_linux_errno(newval); return (copyout(&newval, PTRIN(args->optval), len)); /* NOTREACHED */ default: Modified: head/sys/i386/linux/linux_sysvec.c ============================================================================== --- head/sys/i386/linux/linux_sysvec.c Tue Oct 27 12:44:49 2020 (r367078) +++ head/sys/i386/linux/linux_sysvec.c Tue Oct 27 12:49:40 2020 (r367079) @@ -800,7 +800,7 @@ linux_set_syscall_retval(struct thread *td, int error) if (__predict_false(error != 0)) { if (error != ERESTART && error != EJUSTRETURN) - frame->tf_eax = linux_to_bsd_errno(error); + frame->tf_eax = bsd_to_linux_errno(error); } }