headers
Linux Kernel Mailing List | 1 Oct 2009 03:59

sit: fix off-by-one in ipip6_tunnel_get_prl

Gitweb:     http://git.kernel.org/linus/298bf12ddb25841804f26234a43b89da1b1c0e21
Commit:     298bf12ddb25841804f26234a43b89da1b1c0e21
Parent:     d99927f4d93f36553699573b279e0ff98ad7dea6
Author:     Sascha Hlusiak <contact <at> saschahlusiak.de>
AuthorDate: Tue Sep 29 11:27:05 2009 +0000
Committer:  David S. Miller <davem <at> davemloft.net>
CommitDate: Wed Sep 30 16:39:27 2009 -0700

    sit: fix off-by-one in ipip6_tunnel_get_prl

    When requesting all prl entries (kprl.addr == INADDR_ANY) and there are
    more prl entries than there is space passed from userspace, the existing
    code would always copy cmax+1 entries, which is more than can be handled.

    This patch makes the kernel copy only exactly cmax entries.

    Signed-off-by: Sascha Hlusiak <contact <at> saschahlusiak.de>
    Acked-By: Fred L. Templin <Fred.L.Templin <at> boeing.com>
    Signed-off-by: David S. Miller <davem <at> davemloft.net>
---
 net/ipv6/sit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index d65e0c4..dbd19a7 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
 <at>  <at>  -274,7 +274,7  <at>  <at>  static int ipip6_tunnel_get_prl(struct ip_tunnel *t,

 	c = 0;
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 Oct 2009 03:59

net: Fix sock_wfree() race

Gitweb:     http://git.kernel.org/linus/d99927f4d93f36553699573b279e0ff98ad7dea6
Commit:     d99927f4d93f36553699573b279e0ff98ad7dea6
Parent:     b7058842c940ad2c08dd829b21e5c92ebe3b8758
Author:     Eric Dumazet <eric.dumazet <at> gmail.com>
AuthorDate: Thu Sep 24 10:49:24 2009 +0000
Committer:  David S. Miller <davem <at> davemloft.net>
CommitDate: Wed Sep 30 16:20:38 2009 -0700

    net: Fix sock_wfree() race

    Commit 2b85a34e911bf483c27cfdd124aeb1605145dc80
    (net: No more expensive sock_hold()/sock_put() on each tx)
    opens a window in sock_wfree() where another cpu
    might free the socket we are working on.

    A fix is to call sk->sk_write_space(sk) while still
    holding a reference on sk.

    Reported-by: Jike Song <albcamus <at> gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet <at> gmail.com>
    Signed-off-by: David S. Miller <davem <at> davemloft.net>
---
 net/core/sock.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/net/core/sock.c b/net/core/sock.c
index 77fbfed..7626b6a 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
 <at>  <at>  -1228,17 +1228,22  <at>  <at>  void __init sk_init(void)
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 Oct 2009 03:59

Phonet: fix mutex imbalance

Gitweb:     http://git.kernel.org/linus/013820a360b63a0a18fa13afb858b9f1af7e64fe
Commit:     013820a360b63a0a18fa13afb858b9f1af7e64fe
Parent:     298bf12ddb25841804f26234a43b89da1b1c0e21
Author:     Rémi Denis-Courmont <remi.denis-courmont <at> nokia.com>
AuthorDate: Wed Sep 30 16:41:34 2009 -0700
Committer:  David S. Miller <davem <at> davemloft.net>
CommitDate: Wed Sep 30 16:41:34 2009 -0700

    Phonet: fix mutex imbalance

    From: Rémi Denis-Courmont <remi.denis-courmont <at> nokia.com>

    port_mutex was unlocked twice.

    Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont <at> nokia.com>
    Signed-off-by: David S. Miller <davem <at> davemloft.net>
---
 net/phonet/socket.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index 07aa9f0..aa5b5a9 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
 <at>  <at>  -407,7 +407,6  <at>  <at>  int pn_sock_get_port(struct sock *sk, unsigned short sport)
 	return -EADDRINUSE;

 found:
-	mutex_unlock(&port_mutex);
 	pn->sobject = pn_object(pn_addr(pn->sobject), sport);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 Oct 2009 03:59

net: restore tx timestamping for accelerated vlans

Gitweb:     http://git.kernel.org/linus/81bbb3d4048cf577b5babcb0834230de391a35c5
Commit:     81bbb3d4048cf577b5babcb0834230de391a35c5
Parent:     013820a360b63a0a18fa13afb858b9f1af7e64fe
Author:     Eric Dumazet <eric.dumazet <at> gmail.com>
AuthorDate: Wed Sep 30 16:42:42 2009 -0700
Committer:  David S. Miller <davem <at> davemloft.net>
CommitDate: Wed Sep 30 16:42:42 2009 -0700

    net: restore tx timestamping for accelerated vlans

    Since commit 9b22ea560957de1484e6b3e8538f7eef202e3596
    ( net: fix packet socket delivery in rx irq handler )

    We lost rx timestamping of packets received on accelerated vlans.

    Effect is that tcpdump on real dev can show strange timings, since it gets rx timestamps
    too late (ie at skb dequeueing time, not at skb queueing time)

    14:47:26.986871 IP 192.168.20.110 > 192.168.20.141: icmp 64: echo request seq 1
    14:47:26.986786 IP 192.168.20.141 > 192.168.20.110: icmp 64: echo reply seq 1

    14:47:27.986888 IP 192.168.20.110 > 192.168.20.141: icmp 64: echo request seq 2
    14:47:27.986781 IP 192.168.20.141 > 192.168.20.110: icmp 64: echo reply seq 2

    14:47:28.986896 IP 192.168.20.110 > 192.168.20.141: icmp 64: echo request seq 3
    14:47:28.986780 IP 192.168.20.141 > 192.168.20.110: icmp 64: echo reply seq 3

    Signed-off-by: Eric Dumazet <eric.dumazet <at> gmail.com>
    Signed-off-by: David S. Miller <davem <at> davemloft.net>
---
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 Oct 2009 03:59

net: Make setsockopt() optlen be unsigned.

Gitweb:     http://git.kernel.org/linus/b7058842c940ad2c08dd829b21e5c92ebe3b8758
Commit:     b7058842c940ad2c08dd829b21e5c92ebe3b8758
Parent:     eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0
Author:     David S. Miller <davem <at> davemloft.net>
AuthorDate: Wed Sep 30 16:12:20 2009 -0700
Committer:  David S. Miller <davem <at> davemloft.net>
CommitDate: Wed Sep 30 16:12:20 2009 -0700

    net: Make setsockopt() optlen be unsigned.
    
    This provides safety against negative optlen at the type
    level instead of depending upon (sometimes non-trivial)
    checks against this sprinkled all over the the place, in
    each and every implementation.
    
    Based upon work done by Arjan van de Ven and feedback
    from Linus Torvalds.
    
    Signed-off-by: David S. Miller <davem <at> davemloft.net>
---
 drivers/atm/ambassador.c           |    8 -----
 drivers/atm/eni.c                  |    2 +-
 drivers/atm/firestream.c           |    2 +-
 drivers/atm/fore200e.c             |    2 +-
 drivers/atm/horizon.c              |    2 +-
 drivers/atm/iphase.c               |    2 +-
 drivers/atm/zatm.c                 |    2 +-
 drivers/isdn/mISDN/socket.c        |    2 +-
 drivers/net/pppol2tp.c             |    2 +-
 include/linux/atmdev.h             |    2 +-
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 Oct 2009 03:59

ax25: Fix possible oops in ax25_make_new

Gitweb:     http://git.kernel.org/linus/8c185ab6185bf5e67766edb000ce428269364c86
Commit:     8c185ab6185bf5e67766edb000ce428269364c86
Parent:     81bbb3d4048cf577b5babcb0834230de391a35c5
Author:     Jarek Poplawski <jarkao2 <at> gmail.com>
AuthorDate: Sun Sep 27 10:57:02 2009 +0000
Committer:  David S. Miller <davem <at> davemloft.net>
CommitDate: Wed Sep 30 16:44:12 2009 -0700

    ax25: Fix possible oops in ax25_make_new

    In ax25_make_new, if kmemdup of digipeat returns an error, there would
    be an oops in sk_free while calling sk_destruct, because sk_protinfo
    is NULL at the moment; move sk->sk_destruct initialization after this.

    BTW of reported-by: Bernard Pidoux F6BVP <f6bvp <at> free.fr>

    Signed-off-by: Jarek Poplawski <jarkao2 <at> gmail.com>
    Signed-off-by: David S. Miller <davem <at> davemloft.net>
---
 net/ax25/af_ax25.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index cd1c3dc..f454607 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
 <at>  <at>  -901,7 +901,6  <at>  <at>  struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)

 	sock_init_data(NULL, sk);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 2 Oct 2009 05:59

module: fix up CONFIG_KALLSYMS=n build.

Gitweb:     http://git.kernel.org/linus/3ae91c21dd29e413f4111978152c14061f0984b0
Commit:     3ae91c21dd29e413f4111978152c14061f0984b0
Parent:     817b33d38f81c8736d39283c35c886ae4668f1af
Author:     Paul Mundt <lethal <at> linux-sh.org>
AuthorDate: Thu Oct 1 15:43:54 2009 -0700
Committer:  Linus Torvalds <torvalds <at> linux-foundation.org>
CommitDate: Thu Oct 1 16:11:11 2009 -0700

    module: fix up CONFIG_KALLSYMS=n build.

    Starting from commit 4a4962263f07d14660849ec134ee42b63e95ea9a "reduce
    symbol table for loaded modules (v2)", the kernel/module.c build is broken
    with CONFIG_KALLSYMS disabled.

      CC      kernel/module.o
    kernel/module.c:1995: warning: type defaults to 'int' in declaration of 'Elf_Hdr'
    kernel/module.c:1995: error: expected ';', ',' or ')' before '*' token
    kernel/module.c: In function 'load_module':
    kernel/module.c:2203: error: 'strmap' undeclared (first use in this function)
    kernel/module.c:2203: error: (Each undeclared identifier is reported only once
    kernel/module.c:2203: error: for each function it appears in.)
    kernel/module.c:2239: error: 'symoffs' undeclared (first use in this function)
    kernel/module.c:2239: error: implicit declaration of function 'layout_symtab'
    kernel/module.c:2240: error: 'stroffs' undeclared (first use in this function)
    make[1]: *** [kernel/module.o] Error 1
    make: *** [kernel/module.o] Error 2

    There are three different issues:

        - layout_symtab() takes a const Elf_Ehdr
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 2 Oct 2009 05:59

drivers/input/input.c: fix CONFIG_PM=n warning

Gitweb:     http://git.kernel.org/linus/1c4115e595dec42aa0e81ba47ef46e35b34ed428
Commit:     1c4115e595dec42aa0e81ba47ef46e35b34ed428
Parent:     3ae91c21dd29e413f4111978152c14061f0984b0
Author:     Andrew Morton <akpm <at> linux-foundation.org>
AuthorDate: Thu Oct 1 15:43:55 2009 -0700
Committer:  Linus Torvalds <torvalds <at> linux-foundation.org>
CommitDate: Thu Oct 1 16:11:11 2009 -0700

    drivers/input/input.c: fix CONFIG_PM=n warning

    drivers/input/input.c:1277: warning: 'input_dev_reset' defined but not used

    Acked-by: Dmitry Torokhov <dtor <at> mail.ru>
    Signed-off-by: Andrew Morton <akpm <at> linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds <at> linux-foundation.org>
---
 drivers/input/input.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/input.c b/drivers/input/input.c
index e828aab..16ec33f 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
 <at>  <at>  -1273,6 +1273,7  <at>  <at>  static int input_dev_uevent(struct device *device, struct kobj_uevent_env *env)
 		}						\
 	} while (0)

+#ifdef CONFIG_PM
 static void input_dev_reset(struct input_dev *dev, bool activate)
 {
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 2 Oct 2009 05:59

const: constify remaining file_operations

Gitweb:     http://git.kernel.org/linus/828c09509b9695271bcbdc53e9fc9a6a737148d2
Commit:     828c09509b9695271bcbdc53e9fc9a6a737148d2
Parent:     1c4115e595dec42aa0e81ba47ef46e35b34ed428
Author:     Alexey Dobriyan <adobriyan <at> gmail.com>
AuthorDate: Thu Oct 1 15:43:56 2009 -0700
Committer:  Linus Torvalds <torvalds <at> linux-foundation.org>
CommitDate: Thu Oct 1 16:11:11 2009 -0700

    const: constify remaining file_operations

    [akpm <at> linux-foundation.org: fix KVM]
    Signed-off-by: Alexey Dobriyan <adobriyan <at> gmail.com>
    Acked-by: Mike Frysinger <vapier <at> gentoo.org>
    Signed-off-by: Andrew Morton <akpm <at> linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds <at> linux-foundation.org>
---
 arch/arm/mach-ns9xxx/clock.c               |    2 +-
 arch/blackfin/mach-bf561/coreb.c           |    2 +-
 arch/cris/arch-v10/drivers/sync_serial.c   |    2 +-
 arch/cris/arch-v32/drivers/mach-fs/gpio.c  |    2 +-
 arch/powerpc/kvm/timing.c                  |    2 +-
 arch/powerpc/platforms/cell/spufs/file.c   |    2 +-
 arch/powerpc/platforms/pseries/dtl.c       |    2 +-
 arch/x86/xen/debugfs.c                     |    2 +-
 drivers/acpi/video.c                       |    2 +-
 drivers/block/cciss.c                      |    2 +-
 drivers/char/apm-emulation.c               |    2 +-
 drivers/char/bfin-otp.c                    |    2 +-
 drivers/char/xilinx_hwicap/xilinx_hwicap.c |    2 +-
 drivers/gpio/gpiolib.c                     |    2 +-
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 2 Oct 2009 05:59

asm-generic/gpio.h: pull in linux/kernel.h for might_sleep()

Gitweb:     http://git.kernel.org/linus/b3db4a8ad19173a8fd0ced13d47c97910f1ab14b
Commit:     b3db4a8ad19173a8fd0ced13d47c97910f1ab14b
Parent:     828c09509b9695271bcbdc53e9fc9a6a737148d2
Author:     Mike Frysinger <vapier <at> gentoo.org>
AuthorDate: Thu Oct 1 15:43:56 2009 -0700
Committer:  Linus Torvalds <torvalds <at> linux-foundation.org>
CommitDate: Thu Oct 1 16:11:11 2009 -0700

    asm-generic/gpio.h: pull in linux/kernel.h for might_sleep()

    The asm-generic/gpio.h header uses the might_sleep() macro but doesn't
    include the header for it, so any source code that might include
    linux/gpio.h before linux/kernel.h can easily lead to a build failure.

    Signed-off-by: Mike Frysinger <vapier <at> gentoo.org>
    Signed-off-by: Andrew Morton <akpm <at> linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds <at> linux-foundation.org>
---
 include/asm-generic/gpio.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 9cca378..66d6106 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
 <at>  <at>  -1,6 +1,7  <at>  <at> 
 #ifndef _ASM_GENERIC_GPIO_H
 #define _ASM_GENERIC_GPIO_H

+#include <linux/kernel.h>
(Continue reading)

Permalink | Reply | 0 comments |

Gmane