~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to net/bridge/br_input.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
139
139
 * Return NULL if skb is handled
140
140
 * note: already called with rcu_read_lock
141
141
 */
142
 
struct sk_buff *br_handle_frame(struct sk_buff *skb)
 
142
rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
143
143
{
144
144
        struct net_bridge_port *p;
 
145
        struct sk_buff *skb = *pskb;
145
146
        const unsigned char *dest = eth_hdr(skb)->h_dest;
146
147
        br_should_route_hook_t *rhook;
147
148
 
148
149
        if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
149
 
                return skb;
 
150
                return RX_HANDLER_PASS;
150
151
 
151
152
        if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
152
153
                goto drop;
153
154
 
154
155
        skb = skb_share_check(skb, GFP_ATOMIC);
155
156
        if (!skb)
156
 
                return NULL;
 
157
                return RX_HANDLER_CONSUMED;
157
158
 
158
159
        p = br_port_get_rcu(skb->dev);
159
160
 
163
164
                        goto drop;
164
165
 
165
166
                /* If STP is turned off, then forward */
166
 
                if (p->br->stp_enabled == BR_NO_STP)
 
167
                if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0)
167
168
                        goto forward;
168
169
 
169
170
                if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
170
 
                            NULL, br_handle_local_finish))
171
 
                        return NULL;    /* frame consumed by filter */
172
 
                else
173
 
                        return skb;     /* continue processing */
 
171
                            NULL, br_handle_local_finish)) {
 
172
                        return RX_HANDLER_CONSUMED; /* consumed by filter */
 
173
                } else {
 
174
                        *pskb = skb;
 
175
                        return RX_HANDLER_PASS; /* continue processing */
 
176
                }
174
177
        }
175
178
 
176
179
forward:
178
181
        case BR_STATE_FORWARDING:
179
182
                rhook = rcu_dereference(br_should_route_hook);
180
183
                if (rhook) {
181
 
                        if ((*rhook)(skb))
182
 
                                return skb;
 
184
                        if ((*rhook)(skb)) {
 
185
                                *pskb = skb;
 
186
                                return RX_HANDLER_PASS;
 
187
                        }
183
188
                        dest = eth_hdr(skb)->h_dest;
184
189
                }
185
190
                /* fall through */
194
199
drop:
195
200
                kfree_skb(skb);
196
201
        }
197
 
        return NULL;
 
202
        return RX_HANDLER_CONSUMED;
198
203
}