Michael S. Tsirkin 8fc3b9e9a2 virtio_net: fix error handling for mergeable buffers ... Eric Dumazet noticed that if we encounter an error when processing a mergeable buffer, we don't dequeue all of the buffers from this packet, the result is almost sure to be loss of networking. Jason Wang noticed that we also leak a page and that we don't decrement the rq buf count, so we won't repost buffers (a resource leak). Fix both issues. Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Michael Dalton <mwdalton@google.com> Reported-by: Eric Dumazet <edumazet@google.com> Reported-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-01 20:27:16 -05:00
..
accessibility
acpi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-19 15:50:47 -08:00
amba
ata	tree-wide: use reinit_completion instead of INIT_COMPLETION	2013-11-15 09:32:21 +09:00
atm	atm: idt77252: fix dev refcnt leak	2013-11-19 15:53:02 -05:00
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
bcma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-11-13 17:40:34 +09:00
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2013-11-15 16:33:41 -08:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2013-11-05 15:58:21 -05:00
bus	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00
cdrom
char	The /dev/random changes for 3.13 including a number of improvements in	2013-11-16 10:19:15 -08:00
clk	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
clocksource
connector	connector: improved unaligned access error fix	2013-11-14 17:19:20 -05:00
cpufreq	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
cpuidle	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
crypto	tree-wide: use reinit_completion instead of INIT_COMPLETION	2013-11-15 09:32:21 +09:00
dca
devfreq	Merge branch 'pm-devfreq'	2013-11-07 19:24:20 +01:00
dio
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
edac	Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac	2013-11-18 14:51:52 -08:00
eisa
extcon
firewire	tree-wide: use reinit_completion instead of INIT_COMPLETION	2013-11-15 09:32:21 +09:00
firmware	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
fmc
gpio	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00
gpu	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2013-11-15 16:48:22 -08:00
hsi
hv
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2013-11-15 16:35:10 -08:00
hwspinlock
i2c	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
ide	ide: pmac: remove unnecessary pci_set_drvdata()	2013-11-14 18:21:25 -05:00
idle	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
iio	kfifo API type safety	2013-11-15 09:32:23 +09:00
infiniband	Main batch of InfiniBand/RDMA changes for 3.13:	2013-11-18 15:36:04 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2013-11-15 16:48:22 -08:00
iommu	Don't try to compile shmobile-iommu outside of ARM	2013-11-15 18:57:42 -08:00
ipack
irqchip	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00
isdn	net: rework recvmsg handler msg_name and msg_namelen logic	2013-11-20 21:52:30 -05:00
leds
lguest	x86, asmlinkage, lguest: Pass in globals into assembler statement	2013-11-07 12:13:05 +10:30
macintosh	DeviceTree updates for 3.13. This is a bit larger pull request than	2013-11-12 16:52:17 +09:00
mailbox
md	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
media	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
memory
memstick	tree-wide: use reinit_completion instead of INIT_COMPLETION	2013-11-15 09:32:21 +09:00
message	drivers/message/i2o/driver.c: add missing destroy_workqueue() on error in i2o_driver_register()	2013-11-13 12:09:26 +09:00
mfd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
misc	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mmc	MMC highlights for 3.13:	2013-11-18 14:47:30 -08:00
mtd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
net	virtio_net: fix error handling for mergeable buffers	2013-12-01 20:27:16 -05:00
nfc
ntb
nubus
of	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
oprofile
parisc
parport	Kconfig cleanups for v3.13	2013-11-15 14:05:15 -08:00
pci	kfifo API type safety	2013-11-15 09:32:23 +09:00
pcmcia	DeviceTree updates for 3.13. This is a bit larger pull request than	2013-11-12 16:52:17 +09:00
phy
pinctrl	pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed	2013-11-14 10:43:17 -08:00
platform	tree-wide: use reinit_completion instead of INIT_COMPLETION	2013-11-15 09:32:21 +09:00
pnp	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
power	Highlights:	2013-11-18 15:35:09 -08:00
powercap	PowerCap: Fix build error with option -Werror=format-security	2013-11-05 02:36:57 +01:00
pps	drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr	2013-11-13 12:09:35 +09:00
ps3
ptp
pwm
rapidio
regulator	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
remoteproc
reset
rpmsg
rtc	tree-wide: use reinit_completion instead of INIT_COMPLETION	2013-11-15 09:32:21 +09:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2013-11-19 11:43:21 -08:00
sbus
scsi	genetlink/pmcraid: use proper genetlink multicast API	2013-11-28 18:26:30 -05:00
sfi
sh
sn
spi	tree-wide: use reinit_completion instead of INIT_COMPLETION	2013-11-15 09:32:21 +09:00
ssb
staging	Merge branch 'topic/kbuild-fixes-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-11-18 15:10:05 -08:00
target
tc
thermal	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-19 15:50:47 -08:00
tty	Features:	2013-11-15 13:34:37 +09:00
uio	drivers/uio/uio_pruss.c: use gen_pool_dma_alloc() to allocate sram memory	2013-11-13 12:09:23 +09:00
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
uwb	Driver Core / sysfs patches for 3.13-rc1	2013-11-07 11:42:15 +09:00
vfio
vhost
video	ARM: SoC fixes for 3.13 merge window	2013-11-16 12:45:55 -08:00
virt
virtio	Nothing really exciting: some groundwork for changing virtio endian, and	2013-11-15 13:28:47 +09:00
vlynq
vme
w1	drivers/w1/masters/w1-gpio.c: use dev_get_platdata()	2013-11-15 09:32:21 +09:00
watchdog	watchdog: w83627hf: Use helper functions to access superio registers	2013-11-18 21:34:19 +01:00
xen	Features:	2013-11-15 13:34:37 +09:00
zorro
Kconfig	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
Makefile	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00