1. 31 12月, 2011 29 次提交
  2. 30 12月, 2011 1 次提交
    • M
      Merge tag 'v3.2-rc7' into staging/for_v3.3 · b4d48c94
      Mauro Carvalho Chehab 提交于
      Linux 3.2-rc7
      
      * tag 'v3.2-rc7': (1304 commits)
        Linux 3.2-rc7
        netfilter: xt_connbytes: handle negation correctly
        Btrfs: call d_instantiate after all ops are setup
        Btrfs: fix worker lock misuse in find_worker
        net: relax rcvbuf limits
        rps: fix insufficient bounds checking in store_rps_dev_flow_table_cnt()
        net: introduce DST_NOPEER dst flag
        mqprio: Avoid panic if no options are provided
        bridge: provide a mtu() method for fake_dst_ops
        md/bitmap: It is OK to clear bits during recovery.
        md: don't give up looking for spares on first failure-to-add
        md/raid5: ensure correct assessment of drives during degraded reshape.
        md/linear: fix hot-add of devices to linear arrays.
        sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().
        pata_of_platform: Add missing CONFIG_OF_IRQ dependency.
        ipv4: using prefetch requires including prefetch.h
        VFS: Fix race between CPU hotplug and lglocks
        vfs: __read_cache_page should use gfp argument rather than GFP_KERNEL
        USB: Fix usb/isp1760 build on sparc
        net: Add a flow_cache_flush_deferred function
        ...
      
      Conflicts:
      	drivers/media/common/tuners/tda18218.c
      	drivers/media/video/omap3isp/ispccdc.c
      	drivers/staging/media/as102/as102_drv.h
      b4d48c94
  3. 24 12月, 2011 9 次提交
  4. 23 12月, 2011 1 次提交
    • F
      netfilter: xt_connbytes: handle negation correctly · 0354b48f
      Florian Westphal 提交于
      "! --connbytes 23:42" should match if the packet/byte count is not in range.
      
      As there is no explict "invert match" toggle in the match structure,
      userspace swaps the from and to arguments
      (i.e., as if "--connbytes 42:23" were given).
      
      However, "what <= 23 && what >= 42" will always be false.
      
      Change things so we use "||" in case "from" is larger than "to".
      
      This change may look like it breaks backwards compatibility when "to" is 0.
      However, older iptables binaries will refuse "connbytes 42:0",
      and current releases treat it to mean "! --connbytes 0:42",
      so we should be fine.
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      0354b48f