code review 11996043: [release-branch.go1.1] syscall: prlimit argument error ...

[release-branch.go1.1] syscall: prlimit argument error for Getrlimit and Setrlimit on Linux 32-bit

««« CL 11803043 / ba52f6399462
syscall: prlimit argument error for Getrlimit and Setrlimit on Linux 32-bit

The rlimit arguments for prlimit are reversed for linux 32-bit (386 and arm).
Getrlimit becomes Setrlimit and vice versa.
Fixes issue 5949.

R=iant, mikioh.mikioh, rsc
CC=golang-dev
https://codereview.appspot.com/11803043

Committer: Russ Cox <rsc@golang.org>
»»»

Update issue 5928

[adg, 2013-07-29 00:03:01]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go

[dave_cheney.net, 2013-07-29 00:19:58]

LGTM. This one needs to be called out in the release notes.

On Mon, Jul 29, 2013 at 10:03 AM,  <adg@golang.org> wrote:
> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> [release-branch.go1.1] syscall: prlimit argument error for Getrlimit and
> Setrlimit on Linux 32-bit
>
> ««« CL 11803043 / ba52f6399462
> syscall: prlimit argument error for Getrlimit and Setrlimit on Linux
> 32-bit
>
> The rlimit arguments for prlimit are reversed for linux 32-bit (386 and
> arm).
> Getrlimit becomes Setrlimit and vice versa.
> Fixes issue 5949.
>
> R=iant, mikioh.mikioh, rsc
> CC=golang-dev
> https://codereview.appspot.com/11803043
>
> Committer: Russ Cox <rsc@golang.org>
> »»»
>
> Update issue 5928
>
> Please review this at https://codereview.appspot.com/11996043/
>
> Affected files:
>   A src/pkg/syscall/rlimit_linux_test.go
>   M src/pkg/syscall/syscall_linux_386.go
>   M src/pkg/syscall/syscall_linux_arm.go
>
>
> Index: src/pkg/syscall/rlimit_linux_test.go
> ===================================================================
> new file mode 100644
> --- /dev/null
> +++ b/src/pkg/syscall/rlimit_linux_test.go
> @@ -0,0 +1,41 @@
> +// Copyright 2013 The Go Authors. All rights reserved.
> +// Use of this source code is governed by a BSD-style
> +// license that can be found in the LICENSE file.
> +
> +package syscall_test
> +
> +import (
> +       "syscall"
> +       "testing"
> +)
> +
> +func TestRlimit(t *testing.T) {
> +       var rlimit, zero syscall.Rlimit
> +       err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlimit)
> +       if err != nil {
> +               t.Fatalf("Getrlimit: save failed: %v", err)
> +       }
> +       if zero == rlimit {
> +               t.Fatalf("Getrlimit: save failed: got zero value %#v",
> rlimit)
> +       }
> +       set := rlimit
> +       set.Cur = set.Max - 1
> +       err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &set)
> +       if err != nil {
> +               t.Fatalf("Setrlimit: set failed: %#v %v", set, err)
> +       }
> +       var get syscall.Rlimit
> +       err = syscall.Getrlimit(syscall.RLIMIT_NOFILE, &get)
> +       if err != nil {
> +               t.Fatalf("Getrlimit: get failed: %v", err)
> +       }
> +       set = rlimit
> +       set.Cur = set.Max - 1
> +       if set != get {
> +               t.Fatalf("Rlimit: change failed: wanted %#v got %#v", set,
> get)
> +       }
> +       err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlimit)
> +       if err != nil {
> +               t.Fatalf("Setrlimit: restore failed: %#v %v", rlimit, err)
> +       }
> +}
> Index: src/pkg/syscall/syscall_linux_386.go
> ===================================================================
> --- a/src/pkg/syscall/syscall_linux_386.go
> +++ b/src/pkg/syscall/syscall_linux_386.go
> @@ -78,7 +78,7 @@
>  const rlimInf64 = ^uint64(0)
>
>  func Getrlimit(resource int, rlim *Rlimit) (err error) {
> -       err = prlimit(0, resource, rlim, nil)
> +       err = prlimit(0, resource, nil, rlim)
>         if err != ENOSYS {
>                 return err
>         }
> @@ -106,7 +106,7 @@
>  //sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
>
>  func Setrlimit(resource int, rlim *Rlimit) (err error) {
> -       err = prlimit(0, resource, nil, rlim)
> +       err = prlimit(0, resource, rlim, nil)
>         if err != ENOSYS {
>                 return err
>         }
> Index: src/pkg/syscall/syscall_linux_arm.go
> ===================================================================
> --- a/src/pkg/syscall/syscall_linux_arm.go
> +++ b/src/pkg/syscall/syscall_linux_arm.go
> @@ -119,7 +119,7 @@
>  const rlimInf64 = ^uint64(0)
>
>  func Getrlimit(resource int, rlim *Rlimit) (err error) {
> -       err = prlimit(0, resource, rlim, nil)
> +       err = prlimit(0, resource, nil, rlim)
>         if err != ENOSYS {
>                 return err
>         }
> @@ -147,7 +147,7 @@
>  //sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
>
>  func Setrlimit(resource int, rlim *Rlimit) (err error) {
> -       err = prlimit(0, resource, nil, rlim)
> +       err = prlimit(0, resource, rlim, nil)
>         if err != ENOSYS {
>                 return err
>         }
>
>
> --
>
> ---You received this message because you are subscribed to the Google Groups
> "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-dev+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>

[adg, 2013-07-29 00:34:57]

*** Submitted as https://code.google.com/p/go/source/detail?r=55ac276af5a7 ***

[release-branch.go1.1] syscall: prlimit argument error for Getrlimit and
Setrlimit on Linux 32-bit

««« CL 11803043 / ba52f6399462
syscall: prlimit argument error for Getrlimit and Setrlimit on Linux 32-bit

The rlimit arguments for prlimit are reversed for linux 32-bit (386 and arm).
Getrlimit becomes Setrlimit and vice versa.
Fixes issue 5949.

R=iant, mikioh.mikioh, rsc
CC=golang-dev
https://codereview.appspot.com/11803043

Committer: Russ Cox <rsc@golang.org>
»»»

Update issue 5928

R=golang-dev, dave
CC=golang-dev
https://codereview.appspot.com/11996043