From: Greg Kroah-Hartman Date: Wed, 18 Dec 2013 20:42:34 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.4.75~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4d0378f5369b5a4527ee33e1ab6541b1af96239;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: hpfs-fix-warnings-when-the-filesystem-fills-up.patch revert-net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch sc1200_wdt-fix-oops.patch --- diff --git a/queue-3.4/hpfs-fix-warnings-when-the-filesystem-fills-up.patch b/queue-3.4/hpfs-fix-warnings-when-the-filesystem-fills-up.patch new file mode 100644 index 00000000000..7a557466532 --- /dev/null +++ b/queue-3.4/hpfs-fix-warnings-when-the-filesystem-fills-up.patch @@ -0,0 +1,52 @@ +From bbd465df73f0d8ba41b8a0732766a243d0f5b356 Mon Sep 17 00:00:00 2001 +From: Mikulas Patocka +Date: Sun, 9 Jun 2013 01:25:57 +0200 +Subject: hpfs: fix warnings when the filesystem fills up + +From: Mikulas Patocka + +commit bbd465df73f0d8ba41b8a0732766a243d0f5b356 upstream. + +This patch fixes warnings due to missing lock on write error path. + + WARNING: at fs/hpfs/hpfs_fn.h:353 hpfs_truncate+0x75/0x80 [hpfs]() + Hardware name: empty + Pid: 26563, comm: dd Tainted: P O 3.9.4 #12 + Call Trace: + hpfs_truncate+0x75/0x80 [hpfs] + hpfs_write_begin+0x84/0x90 [hpfs] + _hpfs_bmap+0x10/0x10 [hpfs] + generic_file_buffered_write+0x121/0x2c0 + __generic_file_aio_write+0x1c7/0x3f0 + generic_file_aio_write+0x7c/0x100 + do_sync_write+0x98/0xd0 + hpfs_file_write+0xd/0x50 [hpfs] + vfs_write+0xa2/0x160 + sys_write+0x51/0xa0 + page_fault+0x22/0x30 + system_call_fastpath+0x1a/0x1f + +Signed-off-by: Mikulas Patocka +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/hpfs/file.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/fs/hpfs/file.c ++++ b/fs/hpfs/file.c +@@ -116,9 +116,12 @@ static int hpfs_write_begin(struct file + hpfs_get_block, + &hpfs_i(mapping->host)->mmu_private); + if (unlikely(ret)) { +- loff_t isize = mapping->host->i_size; ++ loff_t isize; ++ hpfs_lock(mapping->host->i_sb); ++ isize = mapping->host->i_size; + if (pos + len > isize) + vmtruncate(mapping->host, isize); ++ hpfs_unlock(mapping->host->i_sb); + } + + return ret; diff --git a/queue-3.4/revert-net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch b/queue-3.4/revert-net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch new file mode 100644 index 00000000000..2a5ce3b81c6 --- /dev/null +++ b/queue-3.4/revert-net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch @@ -0,0 +1,61 @@ +From foo@baz Wed Dec 18 12:40:45 PST 2013 +Date: Wed, 18 Dec 2013 12:40:45 -0800 +To: Greg KH +From: Greg Kroah-Hartman +Subject: Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST" + +It turns out that commit: d3f7d56a7a4671d395e8af87071068a195257bf6 was +applied to the tree twice, which didn't hurt anything, but it's good to +fix this up. + +Reported-by: Veaceslav Falico + +Cc: David S. Miller +Cc: Eric Dumazet +Cc: Richard Weinberger +Cc: Shawn Landden +Cc: Tom Herbert +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/algif_hash.c | 3 --- + crypto/algif_skcipher.c | 3 --- + net/ipv4/udp.c | 3 --- + 3 files changed, 9 deletions(-) + +--- a/crypto/algif_hash.c ++++ b/crypto/algif_hash.c +@@ -117,9 +117,6 @@ static ssize_t hash_sendpage(struct sock + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + +- if (flags & MSG_SENDPAGE_NOTLAST) +- flags |= MSG_MORE; +- + lock_sock(sk); + sg_init_table(ctx->sgl.sg, 1); + sg_set_page(ctx->sgl.sg, page, size, offset); +--- a/crypto/algif_skcipher.c ++++ b/crypto/algif_skcipher.c +@@ -381,9 +381,6 @@ static ssize_t skcipher_sendpage(struct + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + +- if (flags & MSG_SENDPAGE_NOTLAST) +- flags |= MSG_MORE; +- + lock_sock(sk); + if (!ctx->more && ctx->used) + goto unlock; +--- a/net/ipv4/udp.c ++++ b/net/ipv4/udp.c +@@ -1042,9 +1042,6 @@ int udp_sendpage(struct sock *sk, struct + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + +- if (flags & MSG_SENDPAGE_NOTLAST) +- flags |= MSG_MORE; +- + if (!up->pending) { + struct msghdr msg = { .msg_flags = flags|MSG_MORE }; + diff --git a/queue-3.4/sc1200_wdt-fix-oops.patch b/queue-3.4/sc1200_wdt-fix-oops.patch new file mode 100644 index 00000000000..4440c12b385 --- /dev/null +++ b/queue-3.4/sc1200_wdt-fix-oops.patch @@ -0,0 +1,37 @@ +From dace8bbfccfd9e4fcccfffcfbd82881fda3e756f Mon Sep 17 00:00:00 2001 +From: Alan +Date: Wed, 4 Dec 2013 15:31:52 +0000 +Subject: sc1200_wdt: Fix oops + +From: Alan + +commit dace8bbfccfd9e4fcccfffcfbd82881fda3e756f upstream. + +If loaded with isapnp = 0 the driver explodes. This is catching +people out now and then. What should happen in the working case is +a complete mystery and the code appears terminally confused, but we +can at least make the error path work properly. + +Signed-off-by: Alan Cox +Reviewed-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Partially-Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=53991 +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/watchdog/sc1200wdt.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/watchdog/sc1200wdt.c ++++ b/drivers/watchdog/sc1200wdt.c +@@ -409,8 +409,9 @@ static int __init sc1200wdt_init(void) + #if defined CONFIG_PNP + /* now that the user has specified an IO port and we haven't detected + * any devices, disable pnp support */ ++ if (isapnp) ++ pnp_unregister_driver(&scl200wdt_pnp_driver); + isapnp = 0; +- pnp_unregister_driver(&scl200wdt_pnp_driver); + #endif + + if (!request_region(io, io_len, SC1200_MODULE_NAME)) { diff --git a/queue-3.4/series b/queue-3.4/series index b1ac2642e08..508c933df03 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -26,3 +26,6 @@ dm-table-fail-dm_table_create-on-dm_round_up-overflow.patch nfs-fix-do_div-warning-by-instead-using-sector_div.patch staging-comedi-pcmuio-fix-possible-null-deref-on-detach.patch staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch +sc1200_wdt-fix-oops.patch +hpfs-fix-warnings-when-the-filesystem-fills-up.patch +revert-net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch