--- /dev/null
+From bbd465df73f0d8ba41b8a0732766a243d0f5b356 Mon Sep 17 00:00:00 2001
+From: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
+Date: Sun, 9 Jun 2013 01:25:57 +0200
+Subject: hpfs: fix warnings when the filesystem fills up
+
+From: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
+
+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 <mikulas@artax.karlin.mff.cuni.cz>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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;
--- /dev/null
+From foo@baz Wed Dec 18 12:40:45 PST 2013
+Date: Wed, 18 Dec 2013 12:40:45 -0800
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+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 <veaceslav@falico.eu>
+
+Cc: David S. Miller <davem@davemloft.net>
+Cc: Eric Dumazet <eric.dumazet@gmail.com>
+Cc: Richard Weinberger <richard@nod.at>
+Cc: Shawn Landden <shawnlandden@gmail.com>
+Cc: Tom Herbert <therbert@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 };
+
--- /dev/null
+From dace8bbfccfd9e4fcccfffcfbd82881fda3e756f Mon Sep 17 00:00:00 2001
+From: Alan <gnomes@lxorguk.ukuu.org.uk>
+Date: Wed, 4 Dec 2013 15:31:52 +0000
+Subject: sc1200_wdt: Fix oops
+
+From: Alan <gnomes@lxorguk.ukuu.org.uk>
+
+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 <alan@linux.intel.com>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
+Partially-Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=53991
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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)) {
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
projects / thirdparty / kernel / stable-queue.git / commitdiff
