lkml.org 
[lkml]   [2011]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 242/247] netfilter: arp_tables: fix infoleak to userspace
    Date
    From: Vasiliy Kulikov <segoon@openwall.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 42eab94fff18cb1091d3501cd284d6bd6cc9c143 upstream.

    Structures ipt_replace, compat_ipt_replace, and xt_get_revision are
    copied from userspace. Fields of these structs that are
    zero-terminated strings are not checked. When they are used as argument
    to a format string containing "%s" in request_module(), some sensitive
    information is leaked to userspace via argument of spawned modprobe
    process.

    The first bug was introduced before the git epoch; the second is
    introduced by 6b7d31fc (v2.6.15-rc1); the third is introduced by
    6b7d31fc (v2.6.15-rc1). To trigger the bug one should have
    CAP_NET_ADMIN.

    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    net/ipv4/netfilter/arp_tables.c | 3 +++
    1 files changed, 3 insertions(+), 0 deletions(-)

    diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
    index f07d77f..baf7997 100644
    --- a/net/ipv4/netfilter/arp_tables.c
    +++ b/net/ipv4/netfilter/arp_tables.c
    @@ -1085,6 +1085,7 @@ static int do_replace(struct net *net, const void __user *user,
    /* overflow check */
    if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
    return -ENOMEM;
    + tmp.name[sizeof(tmp.name)-1] = 0;

    newinfo = xt_alloc_table_info(tmp.size);
    if (!newinfo)
    @@ -1505,6 +1506,7 @@ static int compat_do_replace(struct net *net, void __user *user,
    return -ENOMEM;
    if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
    return -ENOMEM;
    + tmp.name[sizeof(tmp.name)-1] = 0;

    newinfo = xt_alloc_table_info(tmp.size);
    if (!newinfo)
    @@ -1757,6 +1759,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
    ret = -EFAULT;
    break;
    }
    + rev.name[sizeof(rev.name)-1] = 0;

    try_then_request_module(xt_find_revision(NFPROTO_ARP, rev.name,
    rev.revision, 1, &ret),
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-06-23 19:43    [W:4.141 / U:0.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site