lkml.org 
[lkml]   [2007]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/59] NETFILTER: ctnetlink: check for status attribute existence on conntrack creation
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Pablo Neira Ayuso <pablo@netfilter.org>

    Check that status flags are available in the netlink message received
    to create a new conntrack.

    Fixes a crash in ctnetlink_create_conntrack when the CTA_STATUS attribute
    is not present.

    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---

    net/ipv4/netfilter/ip_conntrack_netlink.c | 8 +++++---
    net/netfilter/nf_conntrack_netlink.c | 8 +++++---
    2 files changed, 10 insertions(+), 6 deletions(-)

    --- linux-2.6.19.2.orig/net/ipv4/netfilter/ip_conntrack_netlink.c
    +++ linux-2.6.19.2/net/ipv4/netfilter/ip_conntrack_netlink.c
    @@ -946,9 +946,11 @@ ctnetlink_create_conntrack(struct nfattr
    ct->timeout.expires = jiffies + ct->timeout.expires * HZ;
    ct->status |= IPS_CONFIRMED;

    - err = ctnetlink_change_status(ct, cda);
    - if (err < 0)
    - goto err;
    + if (cda[CTA_STATUS-1]) {
    + err = ctnetlink_change_status(ct, cda);
    + if (err < 0)
    + goto err;
    + }

    if (cda[CTA_PROTOINFO-1]) {
    err = ctnetlink_change_protoinfo(ct, cda);
    --- linux-2.6.19.2.orig/net/netfilter/nf_conntrack_netlink.c
    +++ linux-2.6.19.2/net/netfilter/nf_conntrack_netlink.c
    @@ -963,9 +963,11 @@ ctnetlink_create_conntrack(struct nfattr
    ct->timeout.expires = jiffies + ct->timeout.expires * HZ;
    ct->status |= IPS_CONFIRMED;

    - err = ctnetlink_change_status(ct, cda);
    - if (err < 0)
    - goto err;
    + if (cda[CTA_STATUS-1]) {
    + err = ctnetlink_change_status(ct, cda);
    + if (err < 0)
    + goto err;
    + }

    if (cda[CTA_PROTOINFO-1]) {
    err = ctnetlink_change_protoinfo(ct, cda);
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-03 03:57    [W:0.025 / U:29.796 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site