Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7677e86843e2136a9b05549a9ca47d4f744565b6

Authored by Herbert Xu
Committed by Pablo Neira Ayuso
1 parent c123bb7163
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

bridge: Do not compile options in br_parse_ip_options 

Commit 462fb2af9788a82a534f8184abfde31574e1cfa0

	bridge : Sanitize skb before it enters the IP stack

broke when IP options are actually used because it mangles the
skb as if it entered the IP stack which is wrong because the
bridge is supposed to operate below the IP stack.

Since nobody has actually requested for parsing of IP options
this patch fixes it by simply reverting to the previous approach
of ignoring all IP options, i.e., zeroing the IPCB.

If and when somebody who uses IP options and actually needs them
to be parsed by the bridge complains then we can revisit this.

Reported-by: David Newall <davidn@davidnewall.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Showing 1 changed file with 5 additions and 19 deletions Side-by-side Diff

net/bridge/br_netfilter.c
Diff comments   View file @ 7677e86
... ... @@ -192,7 +192,6 @@
192 192  
193 193 static int br_parse_ip_options(struct sk_buff *skb)
194 194 {
195   - struct ip_options *opt;
196 195 const struct iphdr *iph;
197 196 struct net_device *dev = skb->dev;
198 197 u32 len;
... ... @@ -201,7 +200,6 @@
201 200 goto inhdr_error;
202 201  
203 202 iph = ip_hdr(skb);
204   - opt = &(IPCB(skb)->opt);
205 203  
206 204 /* Basic sanity checks */
207 205 if (iph->ihl < 5 || iph->version != 4)
... ... @@ -227,23 +225,11 @@
227 225 }
228 226  
229 227 memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
230   - if (iph->ihl == 5)
231   - return 0;
232   -
233   - opt->optlen = iph->ihl*4 - sizeof(struct iphdr);
234   - if (ip_options_compile(dev_net(dev), opt, skb))
235   - goto inhdr_error;
236   -
237   - /* Check correct handling of SRR option */
238   - if (unlikely(opt->srr)) {
239   - struct in_device *in_dev = __in_dev_get_rcu(dev);
240   - if (in_dev && !IN_DEV_SOURCE_ROUTE(in_dev))
241   - goto drop;
242   -
243   - if (ip_options_rcv_srr(skb))
244   - goto drop;
245   - }
246   -
  228 + /* We should really parse IP options here but until
  229 + * somebody who actually uses IP options complains to
  230 + * us we'll just silently ignore the options because
  231 + * we're lazy!
  232 + */
247 233 return 0;
248 234  
249 235 inhdr_error: