lkml.org 
[lkml]   [2006]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 03/24] EBTABLES: Verify that ebt_entries have zero ->distinguisher.
    2.6.18-stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Al Viro <viro@zeniv.linux.org.uk>

    We need that for iterator to work; existing check had been too weak.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    net/bridge/netfilter/ebtables.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- linux-2.6.18.5.orig/net/bridge/netfilter/ebtables.c
    +++ linux-2.6.18.5/net/bridge/netfilter/ebtables.c
    @@ -439,7 +439,7 @@ ebt_check_entry_size_and_hooks(struct eb
    /* beginning of a new chain
    if i == NF_BR_NUMHOOKS it must be a user defined chain */
    if (i != NF_BR_NUMHOOKS || !(e->bitmask & EBT_ENTRY_OR_ENTRIES)) {
    - if ((e->bitmask & EBT_ENTRY_OR_ENTRIES) != 0) {
    + if (e->bitmask != 0) {
    /* we make userspace set this right,
    so there is no misunderstanding */
    BUGPRINT("EBT_ENTRY_OR_ENTRIES shouldn't be set "
    @@ -522,7 +522,7 @@ ebt_get_udc_positions(struct ebt_entry *
    int i;

    /* we're only interested in chain starts */
    - if (e->bitmask & EBT_ENTRY_OR_ENTRIES)
    + if (e->bitmask)
    return 0;
    for (i = 0; i < NF_BR_NUMHOOKS; i++) {
    if ((valid_hooks & (1 << i)) == 0)
    @@ -572,7 +572,7 @@ ebt_cleanup_entry(struct ebt_entry *e, u
    {
    struct ebt_entry_target *t;

    - if ((e->bitmask & EBT_ENTRY_OR_ENTRIES) == 0)
    + if (e->bitmask == 0)
    return 0;
    /* we're done */
    if (cnt && (*cnt)-- == 0)
    @@ -598,7 +598,7 @@ ebt_check_entry(struct ebt_entry *e, str
    int ret;

    /* don't mess with the struct ebt_entries */
    - if ((e->bitmask & EBT_ENTRY_OR_ENTRIES) == 0)
    + if (e->bitmask == 0)
    return 0;

    if (e->bitmask & ~EBT_F_MASK) {
    @@ -1316,7 +1316,7 @@ static inline int ebt_make_names(struct
    char *hlp;
    struct ebt_entry_target *t;

    - if ((e->bitmask & EBT_ENTRY_OR_ENTRIES) == 0)
    + if (e->bitmask == 0)
    return 0;

    hlp = ubase - base + (char *)e + e->target_offset;
    --
    -
    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: 2006-12-15 02:45    [W:0.021 / U:0.432 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site