Hannes Frederic Sowa
e5aed006be
udp: prevent skbs lingering in tunnel socket queues ...
In case we find a socket with encapsulation enabled we should call
the encap_recv function even if just a udp header without payload is
available. The callbacks are responsible for correctly verifying and
dropping the packets.
Also, in case the header validation fails for geneve and vxlan we
shouldn't put the skb back into the socket queue, no one will pick
them up there. Instead we can simply discard them in the respective
encap_recv functions.
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-20 19:56:02 -04:00
Merge branches 'acpi-pci', 'acpi-misc' and 'acpi-tools'
2016-05-16 16:45:48 +02:00
SCSI misc on 20160517
2016-05-18 16:38:59 -07:00
Generic device properties framework update for v4.7-rc1
2016-05-16 19:51:04 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-05-17 16:26:30 -07:00
Bluetooth: Add USB ID 13D3:3487 to ath3k
2016-05-13 16:54:59 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-05-17 16:26:30 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
ARC updates for 4.7-rc1
2016-05-19 09:46:18 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
Merge back new cpuidle material for v4.7.
2016-05-06 22:08:46 +02:00
crypto: qat - change the adf_ctl_stop_devices to void
2016-05-13 17:30:18 +08:00
PM / devfreq: style/typo fixes
2016-05-03 11:22:10 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2016-05-17 17:05:30 -07:00
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
This is the bulk of GPIO changes for kernel cycle v4.7:
2016-05-17 17:39:42 -07:00
ARM: SoC driver updates for v4.7
2016-05-18 13:14:02 -07:00
Merge branch 'for-4.7/wacom' into for-linus
2016-05-17 12:42:27 +02:00
Drivers: hv: vmbus: Fix signaling logic in hv_need_to_signal_on_read()
2016-04-30 14:05:44 -07:00
iio: imu: mpu6050: Fix name/chip_id when using ACPI
2016-05-04 08:44:27 +01:00
SCSI misc on 20160517
2016-05-18 16:38:59 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2016-05-18 17:12:23 -07:00
Linux 4.6-rc6
2016-05-05 08:35:00 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
ISDN: eicon: replace custom hex_asc_lo() / hex_pack_byte()
2016-05-08 23:52:13 -04:00
leds: gpio: Support the "panic-indicator" firmware property
2016-05-06 10:26:07 +02:00
lightnvm: reserved space calculation incorrect
2016-05-06 12:51:10 -06:00
- based on Jens' 'for-4.7/core' to have DM thinp's discard support use
2016-05-17 16:13:00 -07:00
media updates for v4.7-rc1
2016-05-18 17:03:51 -07:00
memstick: trivial fix of spelling mistake on management
2016-04-28 10:58:33 +02:00
SCSI misc on 20160517
2016-05-18 16:38:59 -07:00
This is the bulk of GPIO changes for kernel cycle v4.7:
2016-05-17 17:39:42 -07:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-05-16 16:46:03 -07:00
Merge branch 'for-4.7/drivers' of git://git.kernel.dk/linux-block
2016-05-17 16:03:32 -07:00
ARM: SoC driver updates for v4.7
2016-05-18 13:14:02 -07:00
udp: prevent skbs lingering in tunnel socket queues
2016-05-20 19:56:02 -04:00
NFC: pn533: handle interrupted commands in pn533_recv_frame
2016-05-10 00:01:47 +02:00
libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure
2016-05-06 10:20:10 -07:00
Merge branch 'for-4.7/drivers' of git://git.kernel.dk/linux-block
2016-05-17 16:03:32 -07:00
nvmem: mxs-ocotp: fix buffer overflow in read
2016-05-02 08:18:01 -07:00
ARM: SoC cleanups and fixes for v4.7
2016-05-18 12:28:29 -07:00
ARM: SoC driver updates for v4.7
2016-05-18 13:14:02 -07:00
perf/arm: Special-case hetereogeneous CPUs
2016-05-05 10:13:59 +02:00
ARM: SoC driver updates for v4.7
2016-05-18 13:14:02 -07:00
ARM: SoC driver updates for v4.7
2016-05-18 13:14:02 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
PM / AVS: rockchip-io: make io-domains a child of the GRF
2016-04-26 19:12:28 +02:00
Power management material for v4.7-rc1
2016-05-16 19:17:22 -07:00
Merge remote-tracking branches 'regulator/topic/pwm', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808' and 'regulator/topic/s2mps11' into regulator-next
2016-05-13 14:23:46 +01:00
rapidio/mport_cdev: fix uapi type definitions
2016-05-05 17:38:53 -07:00
Merge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next
2016-05-13 14:23:49 +01:00
remoteproc: Add additional crash reasons
2016-05-12 15:50:19 -07:00
rpmsg: add THIS_MODULE to rpmsg_driver in rpmsg core
2016-05-06 11:08:58 -07:00
SCSI misc on 20160517
2016-05-18 16:38:59 -07:00
scsi_tcp: block BH in TCP callbacks
2016-05-19 11:36:49 -07:00
ARM: SoC driver updates for v4.7
2016-05-18 13:14:02 -07:00
Merge remote-tracking branches 'spi/fix/fsl-dspi', 'spi/fix/omap2-mcspi', 'spi/fix/pxa2xx' and 'spi/fix/ti-qspi' into spi-linus
2016-05-06 18:20:37 +01:00
ssb: gpio_driver: use gpiochip data pointer
2016-04-26 15:34:49 +02:00
media updates for v4.7-rc1
2016-05-18 17:03:51 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2016-05-17 17:05:30 -07:00
Thermal / ACPI / video: add INT3406 thermal driver
2016-05-11 02:15:31 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
ACPI material for v4.7-rc1
2016-05-16 19:41:41 -07:00
virtio: Silence uninitialized variable warning
2016-05-01 15:50:08 +03:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-05-19 10:02:26 -07:00
Merge branch 'linus' into efi/core, to pick up fixes
2016-05-07 07:00:07 +02:00
e5aed006be