Commits · 2761f394f74ca3fbb7e740848054a177ff1e3c77 · nexedi / linux

20 Nov, 2004 21 commits

[PATCH] compat_sys_fcntl[64] contain superfluous, buggy test · 2761f394

Andreas Gruenbacher authored Nov 19, 2004

here is a fix to a previous ChangeSet from John; 32-bit emulation of flock(fd,
F_GETLK, &lock) currently is broken.

The ChangeSet:
http://linux.bkbits.net:8080/linux-2.5/cset%404152257aJKu1UClRcfvhsK6IjGYSeQ?nav=index.html|ChangeSet@-12w
from John Engel <jhe@us.ibm.com> fixes an off-by-one error and according
to the ChangeSet comment, it also contains a fix to handle l_len < 0 which
is now defined in POSIX 1003.1-2001 from the fcntl man page.

Gordon Jin <gordon.jin@intel.com> reports that the added test causes
compat_sys_fcntl[64] to fail: If fcntl(fd, F_GETLK, &lock) finds no
conflicting lock it sets l_whence to F_UNLCK, leaves all the other fields
unchanged, and returns 0.  The (f.l_start < 0) test wrongly converts this
to an EINVAL result.

The underlying sys_fcntl function which compat_sys_fcntl and
compat_sys_fcntl64 invoke already handles POSIX behavior correctly.  The
additional tests in the compat wrappers are not needed.

Here is a test case; its expected result is:

PASS
get flock: l_type=1, l_whence=0, l_start=145, l_len=10

#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>

int
main(int argc, char *argv[])
{
    int fd;
    struct flock fl;
    char buf[255];

    fl.l_type = F_WRLCK;
    fl.l_whence = SEEK_END;
    fl.l_start = -100;
    fl.l_len = -10;
    /*
    fl.l_whence = SEEK_SET;
    fl.l_start = 100;
    fl.l_len = 10;
    */

    switch(fork()) {
	case -1:
	    perror("fork");
	    exit(-1);

	case 0:
	    fd = open("/tmp/testfile", O_RDWR|O_CREAT, 0600);
	    if (fd == -1) {
		perror("open");
		exit(-1);
	    }

	    if (write(fd, buf, 255) == -1) {
		perror("write");
		exit(-1);
	    }
	    if (fcntl(fd, F_SETLK, &fl) == -1) {
		perror("F_SETLK");
		exit(-1);
	    }
	    sleep(2);
	    break;

	default:
	    sleep(1);
	    fd = open("/tmp/testfile", O_RDWR|O_CREAT, 0600);
	    if (fd == -1) {
		perror("open");
		exit(-1);
	    }

	    if (fcntl(fd, F_SETLK, &fl) != -1 || errno != EAGAIN) {
		perror("F_SETLK");
		exit(1);
	    }

	    fl.l_type = F_WRLCK;
	    /*
	    fl.l_whence = SEEK_SET;
	    fl.l_start = 0;
	    fl.l_len = 0;
	    */
	    if (fcntl(fd, F_GETLK, &fl) == -1) {
		perror("F_GETLK");
		printf("FAIL\n");
		exit(-1);
	    }
	    printf("PASS\n");
	    printf("get flock: l_type=%d, l_whence=%d, l_start=%zd, "
	    	   "l_len=%zd\n", fl.l_type, fl.l_whence,
		   (size_t) fl.l_start, (size_t) fl.l_len);
	    break;
    }
    exit(0);
}
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2761f394

[PATCH] x86_64: duplicated patch · 6c782bd7

Andrew Morton authored Nov 19, 2004

We ended up adding this patch twice.

Cc: <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

6c782bd7

[PATCH] (4/4) eicon iomem annotations and fixes · 42f61295

Alexander Viro authored Nov 19, 2004

 * s_4bri.c has a nasty typo - bogus & in qBri_cpu_trapped().

   We have
	void *base;
   followed by
	regs[0] = READ_DWORD((&base + offset) + 0x70);

   which is *NOT* what is meant there - instead of access to memory
   pointed to by base we get access to _stack_ at some offset from the
   place where the local variable base lives.
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

42f61295

[PATCH] (3/4) eicon iomem annotations and fixes · b9454566

Alexander Viro authored Nov 19, 2004

 * new helpers - READ_BYTE() and WRITE_BYTE().  On Linux they are
   needed, since direct access to iomem pointers is not allowed (and
   does not work on some architectures).
 * memcpy() to/from iomem is not allowed on Linux (same story).

Proper primitives are memcpy_toio() and memcpy_fromio().  Several places
misused memcpy(); switched to memcpy_{to,from}io().
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

b9454566

[PATCH] (2/4) eicon iomem annotations and fixes · 8ffe9298

Alexander Viro authored Nov 19, 2004

 * added __iomem to declarations of iomem pointers
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8ffe9298

[PATCH] (1/4) eicon iomem annotations and fixes · 1ef1c398

Alexander Viro authored Nov 19, 2004

 * adds new helpers ({GET,PUT}_{WORD,DWORD}) parallel to READ_WORD
   et.al., but used on normal memory instead of iomem.  Instances of
   READ_WORD and friends that are applied to vmalloc'ed memory and local
   variables switched to new helpers.
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1ef1c398

[PATCH] drivers/media annotations · 4f5f573e

Alexander Viro authored Nov 19, 2004

trivial iomem annotations
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4f5f573e

[PATCH] ad1889 annotations and fixes · c083a79a
Alexander Viro authored Nov 19, 2004
```
fixed leaks on failure exits in ->probe()
```
c083a79a

[PATCH] 64bit portability fixes · 28b3389a

Alexander Viro authored Nov 19, 2004

assorted 64bit issues - extraction of number passed in pointer, use of
%zd for size_t, ssize_t instead of int as return value of ->read(), %p
for pointers instead of casting to int and using %x.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

28b3389a

[PATCH] iphase iomem annotations · 0598e144

Alexander Viro authored Nov 19, 2004

partially annotated
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

0598e144

[PATCH] tgafb iomem annotations · 5b36b1f9

Alexander Viro authored Nov 19, 2004

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5b36b1f9

[PATCH] pcilynx iomem annotations · af765221

Alexander Viro authored Nov 19, 2004

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

af765221

[PATCH] sparc io.h annotations and fixes · 54685b18

Alexander Viro authored Nov 19, 2004

 * annotations for sparc io.h
 * missing memcpy_toio()/memcpy_fromio() added
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

54685b18

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · efcc5858
Linus Torvalds authored Nov 19, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
efcc5858

[ARM PATCH] 2267/1: don't fiddle with GPDR/GAFR directly · a60600fb

Nicolas Pitre authored Nov 20, 2004

Patch from Nicolas Pitre

This is preemption unsafe and rather not pretty.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

a60600fb

[ARM] kill unused call_irq() · e4e8e950

Christoph Hellwig authored Nov 20, 2004

Patch from Christoph Hellwig

These routine in arm is unused (in fact not even compiled).

Instead of converting it to local_softirq_pending I'd suggest just
removing it as below as it's been there totally unused for a long
time.

e4e8e950

[ARM] Fix VFP NaN flag handling. · afc09008

Russell King authored Nov 20, 2004

The special non-signalling NaN flag was escaping and setting some
FPSCR exception enable flags.  Ensure that this flag is masked out
before we update the FPSCR.

afc09008

[ARM] Add missing ecard_resource_flags() macro. · 081d2786
Russell King authored Nov 20, 2004

081d2786
[ARM] Sparse fixes · 3f6a2676
Russell King authored Nov 20, 2004
```
Clean up sparse warnings in rtctime.c and netwinder-hw.c
```
3f6a2676
Merge bk://kernel.bkbits.net/davem/net-2.6 · dacfa425
Linus Torvalds authored Nov 19, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
dacfa425
Merge bk://kernel.bkbits.net/davem/sparc-2.6 · bc6e5443
Linus Torvalds authored Nov 19, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
bc6e5443

19 Nov, 2004 19 commits

[AF_UNIX]: Don't lose ECONNRESET in unix_seqpacket_sendmsg() · 6e14891f

James Morris authored Nov 19, 2004

The fix for SELinux w/SOCK_SEQPACKET had an error,
noted by Alan Cox.  This fixes it.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

6e14891f

[PATCH] fastcall fixes for x86 smp interrupts · 1514a193

Brian Gerst authored Nov 19, 2004

I cross-checked the functions called by the BUILD_INTERRUPT macros and
came up with this patch. Even though some of these functions currently
take no args I made them all consistent. Some functions in the Voyager
code that are not directly called from asm code become static.
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1514a193

Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6 · e5af34a2
Linus Torvalds authored Nov 19, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
e5af34a2