Eric Dumazet 76fe45812a tuntap: reset network header before calling skb_get_rxhash() ...

Commit 499744209b (tuntap: dont use skb after netif_rx_ni(skb))
introduced another bug.

skb_get_rxhash() needs to access the network header, and it was
set for us in netif_rx_ni().

We need to reset network header or else skb_flow_dissect() behavior
is out of control.

Reported-and-tested-by: Kirill A. Shutemov <kirill@shutemov.name>
Tested-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2012-12-17 12:32:44 -08:00

..

accessibility

…

acpi

Merge tag 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2012-12-13 12:14:47 -08:00

amba

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-12 11:51:39 -08:00

ata

Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-12 11:45:16 -08:00

atm

solos-pci: fix double-free of TX skb in DMA mode

2012-12-12 00:16:47 -05:00

auxdisplay

…

base

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-12-13 19:22:22 -08:00

bcma

bcma: mips: fix clearing device IRQ

2012-12-10 15:49:53 -05:00

block

mtip32xx: Fix padding issue

2012-11-23 14:32:55 +01:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2012-12-12 18:07:07 -08:00

bus

drivers: bus: ocp2scp: add pdata support

2012-11-07 09:35:53 -08:00

cdrom

…

char

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

clk

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-13 10:57:16 -08:00

clocksource

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-13 10:57:16 -08:00

connector

…

cpufreq

Merge tag 'pm+acpi-for-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-12-11 12:45:35 -08:00

cpuidle

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-12 12:05:15 -08:00

crypto

Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-13 10:58:20 -08:00

dca

…

devfreq

Merge branch 'pm-devfreq'

2012-12-07 23:13:36 +01:00

dio

…

dma

Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-13 10:58:20 -08:00

edac

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

2012-12-11 11:28:43 -08:00

eisa

eisa: Fix spelling of "asynchronous".

2012-11-19 14:30:25 +01:00

extcon

extcon: remove use of __devexit_p

2012-11-26 15:57:24 -08:00

firewire

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

firmware

efi_pstore: Add a format check for an existing variable name at erasing time

2012-11-26 16:08:37 -08:00

gpio

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

gpu

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2012-12-13 14:20:19 -08:00

hid

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-12-13 19:22:22 -08:00

hsi

…

hv

hv: hv_balloon: mark a function static

2012-11-21 12:46:40 -08:00

hwmon

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-13 10:59:11 -08:00

hwspinlock

hwspinlock: remove use of __devexit

2012-11-28 11:41:36 -08:00

i2c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

ide

…

idle

cpuidle: Measure idle state durations with monotonic clock

2012-11-27 14:17:58 +01:00

iio

iio: imu: adis16480: remove duplicated include from adis16480.c

2012-11-30 13:11:46 +00:00

infiniband

Merge branch 'nes' into for-next

2012-12-08 20:45:48 -08:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

2012-12-13 12:00:48 -08:00

iommu

Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-12 11:45:16 -08:00

ipack

Merge tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2012-12-11 14:08:47 -08:00

irqchip

Merge tag 'sunxi-fixes-for-3.8' of git://github.com/mripard/linux into next/soc

2012-12-07 16:29:05 -08:00

isdn

mISDN: fix race in timer canceling on module unloading

2012-12-14 13:14:07 -05:00

leds

Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-12 12:14:06 -08:00

lguest

…

macintosh

bootmem: fix wrong call parameter for free_bootmem()

2012-12-11 17:22:28 -08:00

md

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-12-13 19:22:22 -08:00

memory

…

memstick

drivers/memstick: Add realtek pcie memstick host driver

2012-11-15 17:30:14 -08:00

message

messages: i2o: Fix typo in messages/i2o

2012-11-28 17:13:59 +01:00

mfd

Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6

2012-12-13 19:26:04 -08:00

misc

Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-12-13 11:51:23 -08:00

mmc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

mtd

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

net

tuntap: reset network header before calling skb_get_rxhash()

2012-12-17 12:32:44 -08:00

nfc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-25 12:49:17 -05:00

nubus

…

of

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

2012-12-13 13:21:19 -08:00

oprofile

…

parisc

…

parport

drivers/parport: remove depends on CONFIG_EXPERIMENTAL

2012-11-15 17:27:06 -08:00

pci

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2012-12-13 14:20:19 -08:00

pcmcia

Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-12 11:45:16 -08:00

pinctrl

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-13 10:57:16 -08:00

platform

Thermal: Pass zone parameters as argument to tzd_register

2012-11-05 13:59:57 +08:00

pnp

Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2012-12-11 13:13:55 -08:00

power

Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6

2012-12-13 19:26:04 -08:00

pps

pps, ptp: Remove dependencies on EXPERIMENTAL

2012-11-01 11:35:17 -04:00

ps3

…

ptp

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2012-12-12 18:07:07 -08:00

pwm

pwm: remove use of __devexit

2012-11-28 12:23:41 -08:00

rapidio

Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2012-12-11 13:13:55 -08:00

regulator

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

remoteproc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

rpmsg

…

rtc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2012-12-13 14:20:19 -08:00

sbus

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2012-12-13 19:20:31 -08:00

sfi

…

sh

Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

2012-11-12 21:45:19 +01:00

sn

…

spi

Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

2012-12-13 19:15:11 -08:00

ssb

ssb: use WARN in main.c

2012-12-10 15:47:32 -05:00

staging

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-12-13 19:22:22 -08:00

target

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

tc

…

thermal

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

tty

Merge tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2012-12-13 15:31:08 -08:00

uio

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-12 12:05:15 -08:00

usb

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

uwb

uwb: fix uwb_dev_unlock() missed at an error path in uwb_rc_cmd_async()

2012-11-26 15:58:43 -08:00

vfio

…

vhost

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

video

Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-12-13 10:58:20 -08:00

virt

…

virtio

virtio_balloon: introduce migration primitives to balloon pages

2012-12-11 17:22:27 -08:00

vlynq

…

vme

vme: vme_tsi148.c: use module_pci_driver to simplify the code

2012-10-25 12:02:11 -07:00

w1

w1-gpio: Simplify & get rid of defines

2012-11-26 16:16:35 -08:00

watchdog

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

xen

Merge tag 'stable/for-linus-3.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2012-12-13 14:29:16 -08:00

zorro

…

Kconfig

Staging: ipack: move out of staging

2012-11-16 08:14:18 -08:00

Makefile

Staging: ipack: move out of staging

2012-11-16 08:14:18 -08:00