From: Greg Kroah-Hartman Date: Mon, 10 Nov 2014 05:46:09 +0000 (+0900) Subject: 3.10-stable patches X-Git-Tag: v3.10.60~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f810964d7ceb21f79a3f65518023baf00598f52b;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: cpc925_edac-report-ue-events-properly.patch e7xxx_edac-report-ce-events-properly.patch ext3-don-t-check-quota-format-when-there-are-no-quota-files.patch i3200_edac-report-ce-events-properly.patch i82860_edac-report-ce-events-properly.patch nfsd4-fix-crash-on-unknown-operation-number.patch quota-properly-return-errors-from-dquot_writeback_dquots.patch --- diff --git a/queue-3.10/cpc925_edac-report-ue-events-properly.patch b/queue-3.10/cpc925_edac-report-ue-events-properly.patch new file mode 100644 index 00000000000..4f76000edc4 --- /dev/null +++ b/queue-3.10/cpc925_edac-report-ue-events-properly.patch @@ -0,0 +1,31 @@ +From fa19ac4b92bc2b5024af3e868f41f81fa738567a Mon Sep 17 00:00:00 2001 +From: Jason Baron +Date: Wed, 15 Oct 2014 20:47:28 +0000 +Subject: cpc925_edac: Report UE events properly + +From: Jason Baron + +commit fa19ac4b92bc2b5024af3e868f41f81fa738567a upstream. + +Fix UE event being reported as HW_EVENT_ERR_CORRECTED. + +Signed-off-by: Jason Baron +Link: http://lkml.kernel.org/r/8beb13803500076fef827eab33d523e355d83759.1413405053.git.jbaron@akamai.com +Signed-off-by: Borislav Petkov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/edac/cpc925_edac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/edac/cpc925_edac.c ++++ b/drivers/edac/cpc925_edac.c +@@ -562,7 +562,7 @@ static void cpc925_mc_check(struct mem_c + + if (apiexcp & UECC_EXCP_DETECTED) { + cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n"); +- edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, ++ edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, + pfn, offset, 0, + csrow, -1, -1, + mci->ctl_name, ""); diff --git a/queue-3.10/e7xxx_edac-report-ce-events-properly.patch b/queue-3.10/e7xxx_edac-report-ce-events-properly.patch new file mode 100644 index 00000000000..f3fbaa687d1 --- /dev/null +++ b/queue-3.10/e7xxx_edac-report-ce-events-properly.patch @@ -0,0 +1,31 @@ +From 8030122a9ccf939186f8db96c318dbb99b5463f6 Mon Sep 17 00:00:00 2001 +From: Jason Baron +Date: Sat, 18 Oct 2014 16:06:32 +0200 +Subject: e7xxx_edac: Report CE events properly + +From: Jason Baron + +commit 8030122a9ccf939186f8db96c318dbb99b5463f6 upstream. + +Fix CE event being reported as HW_EVENT_ERR_UNCORRECTED. + +Signed-off-by: Jason Baron +Link: http://lkml.kernel.org/r/e6dd616f2cd51583a7e77af6f639b86313c74144.1413405053.git.jbaron@akamai.com +Signed-off-by: Borislav Petkov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/edac/e7xxx_edac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/edac/e7xxx_edac.c ++++ b/drivers/edac/e7xxx_edac.c +@@ -226,7 +226,7 @@ static void process_ce(struct mem_ctl_in + static void process_ce_no_info(struct mem_ctl_info *mci) + { + edac_dbg(3, "\n"); +- edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0, -1, -1, -1, ++ edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0, 0, -1, -1, -1, + "e7xxx CE log register overflow", ""); + } + diff --git a/queue-3.10/ext3-don-t-check-quota-format-when-there-are-no-quota-files.patch b/queue-3.10/ext3-don-t-check-quota-format-when-there-are-no-quota-files.patch new file mode 100644 index 00000000000..1db6eff000c --- /dev/null +++ b/queue-3.10/ext3-don-t-check-quota-format-when-there-are-no-quota-files.patch @@ -0,0 +1,37 @@ +From 7938db449bbc55bbeb164bec7af406212e7e98f1 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Tue, 16 Sep 2014 22:23:10 +0200 +Subject: ext3: Don't check quota format when there are no quota files + +From: Jan Kara + +commit 7938db449bbc55bbeb164bec7af406212e7e98f1 upstream. + +The check whether quota format is set even though there are no +quota files with journalled quota is pointless and it actually +makes it impossible to turn off journalled quotas (as there's +no way to unset journalled quota format). Just remove the check. + +Signed-off-by: Jan Kara +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ext3/super.c | 7 ------- + 1 file changed, 7 deletions(-) + +--- a/fs/ext3/super.c ++++ b/fs/ext3/super.c +@@ -1300,13 +1300,6 @@ set_qf_format: + "not specified."); + return 0; + } +- } else { +- if (sbi->s_jquota_fmt) { +- ext3_msg(sb, KERN_ERR, "error: journaled quota format " +- "specified with no journaling " +- "enabled."); +- return 0; +- } + } + #endif + return 1; diff --git a/queue-3.10/i3200_edac-report-ce-events-properly.patch b/queue-3.10/i3200_edac-report-ce-events-properly.patch new file mode 100644 index 00000000000..d34a82dc760 --- /dev/null +++ b/queue-3.10/i3200_edac-report-ce-events-properly.patch @@ -0,0 +1,36 @@ +From 8a3f075d6c9b3612b4a5fb2af8db82b38b20caf0 Mon Sep 17 00:00:00 2001 +From: Jason Baron +Date: Wed, 15 Oct 2014 20:47:21 +0000 +Subject: i3200_edac: Report CE events properly + +From: Jason Baron + +commit 8a3f075d6c9b3612b4a5fb2af8db82b38b20caf0 upstream. + +Fix CE event being reported as HW_EVENT_ERR_UNCORRECTED. + +Signed-off-by: Jason Baron +Link: http://lkml.kernel.org/r/d02465b4f30314b390c12c061502eda5e9d29c52.1413405053.git.jbaron@akamai.com +Signed-off-by: Borislav Petkov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/edac/i3200_edac.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/edac/i3200_edac.c ++++ b/drivers/edac/i3200_edac.c +@@ -242,11 +242,11 @@ static void i3200_process_error_info(str + -1, -1, + "i3000 UE", ""); + } else if (log & I3200_ECCERRLOG_CE) { +- edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, ++ edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, + 0, 0, eccerrlog_syndrome(log), + eccerrlog_row(channel, log), + -1, -1, +- "i3000 UE", ""); ++ "i3000 CE", ""); + } + } + } diff --git a/queue-3.10/i82860_edac-report-ce-events-properly.patch b/queue-3.10/i82860_edac-report-ce-events-properly.patch new file mode 100644 index 00000000000..ba7ae7c8415 --- /dev/null +++ b/queue-3.10/i82860_edac-report-ce-events-properly.patch @@ -0,0 +1,31 @@ +From ab0543de6ff0877474f57a5aafbb51a61e88676f Mon Sep 17 00:00:00 2001 +From: Jason Baron +Date: Wed, 15 Oct 2014 20:47:24 +0000 +Subject: i82860_edac: Report CE events properly + +From: Jason Baron + +commit ab0543de6ff0877474f57a5aafbb51a61e88676f upstream. + +Fix CE event being reported as HW_EVENT_ERR_UNCORRECTED. + +Signed-off-by: Jason Baron +Link: http://lkml.kernel.org/r/7aee8e244a32ff86b399a8f966c4aae70296aae0.1413405053.git.jbaron@akamai.com +Signed-off-by: Borislav Petkov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/edac/i82860_edac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/edac/i82860_edac.c ++++ b/drivers/edac/i82860_edac.c +@@ -124,7 +124,7 @@ static int i82860_process_error_info(str + dimm->location[0], dimm->location[1], -1, + "i82860 UE", ""); + else +- edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, ++ edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, + info->eap, 0, info->derrsyn, + dimm->location[0], dimm->location[1], -1, + "i82860 CE", ""); diff --git a/queue-3.10/nfsd4-fix-crash-on-unknown-operation-number.patch b/queue-3.10/nfsd4-fix-crash-on-unknown-operation-number.patch new file mode 100644 index 00000000000..444dc93ad1b --- /dev/null +++ b/queue-3.10/nfsd4-fix-crash-on-unknown-operation-number.patch @@ -0,0 +1,34 @@ +From 51904b08072a8bf2b9ed74d1bd7a5300a614471d Mon Sep 17 00:00:00 2001 +From: "J. Bruce Fields" +Date: Wed, 22 Oct 2014 14:46:29 -0400 +Subject: nfsd4: fix crash on unknown operation number + +From: "J. Bruce Fields" + +commit 51904b08072a8bf2b9ed74d1bd7a5300a614471d upstream. + +Unknown operation numbers are caught in nfsd4_decode_compound() which +sets op->opnum to OP_ILLEGAL and op->status to nfserr_op_illegal. The +error causes the main loop in nfsd4_proc_compound() to skip most +processing. But nfsd4_proc_compound also peeks ahead at the next +operation in one case and doesn't take similar precautions there. + +Signed-off-by: J. Bruce Fields +Signed-off-by: Greg Kroah-Hartman + +--- + fs/nfsd/nfs4proc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/nfsd/nfs4proc.c ++++ b/fs/nfsd/nfs4proc.c +@@ -1191,7 +1191,8 @@ static bool need_wrongsec_check(struct s + */ + if (argp->opcnt == resp->opcnt) + return false; +- ++ if (next->opnum == OP_ILLEGAL) ++ return false; + nextd = OPDESC(next); + /* + * Rest of 2.6.3.1.1: certain operations will return WRONGSEC diff --git a/queue-3.10/quota-properly-return-errors-from-dquot_writeback_dquots.patch b/queue-3.10/quota-properly-return-errors-from-dquot_writeback_dquots.patch new file mode 100644 index 00000000000..ad68db06e45 --- /dev/null +++ b/queue-3.10/quota-properly-return-errors-from-dquot_writeback_dquots.patch @@ -0,0 +1,33 @@ +From 474d2605d119479e5aa050f738632e63589d4bb5 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Wed, 22 Oct 2014 09:06:49 +0200 +Subject: quota: Properly return errors from dquot_writeback_dquots() + +From: Jan Kara + +commit 474d2605d119479e5aa050f738632e63589d4bb5 upstream. + +Due to a switched left and right side of an assignment, +dquot_writeback_dquots() never returned error. This could result in +errors during quota writeback to not be reported to userspace properly. +Fix it. + +Coverity-id: 1226884 +Signed-off-by: Jan Kara +Signed-off-by: Greg Kroah-Hartman + +--- + fs/quota/dquot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/quota/dquot.c ++++ b/fs/quota/dquot.c +@@ -637,7 +637,7 @@ int dquot_writeback_dquots(struct super_ + dqstats_inc(DQST_LOOKUPS); + err = sb->dq_op->write_dquot(dquot); + if (!ret && err) +- err = ret; ++ ret = err; + dqput(dquot); + spin_lock(&dq_list_lock); + } diff --git a/queue-3.10/series b/queue-3.10/series index 474b04663bf..b7213995956 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -96,3 +96,10 @@ usb-do-not-allow-usb_alloc_streams-on-unconfigured-devices.patch cgroup-kmemleak-add-kmemleak_free-for-cgroup-deallocations.patch lib-bitmap.c-fix-undefined-shift-in-__bitmap_shift_-left-right.patch scsi-fix-error-handling-in-scsi_ioctl_send_command.patch +i82860_edac-report-ce-events-properly.patch +i3200_edac-report-ce-events-properly.patch +e7xxx_edac-report-ce-events-properly.patch +cpc925_edac-report-ue-events-properly.patch +nfsd4-fix-crash-on-unknown-operation-number.patch +ext3-don-t-check-quota-format-when-there-are-no-quota-files.patch +quota-properly-return-errors-from-dquot_writeback_dquots.patch