From dd77d2b803e3cfd528a217bca9177b8f524ecad9 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 22 Oct 2012 10:47:21 -0400 Subject: [PATCH 1/2] Add verrel to changelog for build --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 853299de7..fda1a0050 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2334,7 +2334,7 @@ fi # '-' | | # '-' %changelog -* Mon Oct 22 2012 Josh Boyer +* Mon Oct 22 2012 Josh Boyer - 3.6.3-1 - CVE-2012-0957: uts: stack memory leak in UNAME26 (rhbz 862877 864824) - Fix rt2x00 usb reset resume (rhbz 856863) - Linux v3.6.3 From c8c2a319d5140e876cf2a1630a44ee42c43cc733 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 22 Oct 2012 15:46:47 -0400 Subject: [PATCH 2/2] Add patch to fix CIFS oops from Jeff Layton (rhbz 867344) --- ...ifs_lookup-on-hashed-negative-dentry.patch | 21 +++++++++++++++++++ kernel.spec | 9 ++++++++ 2 files changed, 30 insertions(+) create mode 100644 dont-call-cifs_lookup-on-hashed-negative-dentry.patch diff --git a/dont-call-cifs_lookup-on-hashed-negative-dentry.patch b/dont-call-cifs_lookup-on-hashed-negative-dentry.patch new file mode 100644 index 000000000..88b35e2f8 --- /dev/null +++ b/dont-call-cifs_lookup-on-hashed-negative-dentry.patch @@ -0,0 +1,21 @@ +@@ -, +, @@ + negative dentry + BUG_ON(!d_unhashed(entry)); + fs/cifs/dir.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +--- a/fs/cifs/dir.c ++++ a/fs/cifs/dir.c +@@ -398,7 +398,12 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, + * in network traffic in the other paths. + */ + if (!(oflags & O_CREAT)) { +- struct dentry *res = cifs_lookup(inode, direntry, 0); ++ struct dentry *res; ++ ++ if (!direntry->d_inode) ++ return -ENOENT; ++ ++ res = cifs_lookup(inode, direntry, 0); + if (IS_ERR(res)) + return PTR_ERR(res); + diff --git a/kernel.spec b/kernel.spec index fda1a0050..e8daa37e4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -759,6 +759,9 @@ Patch22075: rt2x00-usb-fix-reset-resume.patch #rhbz 862877 864824 CVE-2012-0957 Patch22076: fix-stack-memory-content-leak-via-UNAME26.patch +#rhbz 867344 +Patch22077: dont-call-cifs_lookup-on-hashed-negative-dentry.patch + Patch22072: linux-3.6-arm-build-fixup.patch # END OF PATCH DEFINITIONS @@ -1471,6 +1474,9 @@ ApplyPatch rt2x00-usb-fix-reset-resume.patch #rhbz 862877 864824 CVE-2012-0957 ApplyPatch fix-stack-memory-content-leak-via-UNAME26.patch +#rhbz 867344 +ApplyPatch dont-call-cifs_lookup-on-hashed-negative-dentry.patch + # END OF PATCH APPLICATIONS %endif @@ -2334,6 +2340,9 @@ fi # '-' | | # '-' %changelog +* Mon Oct 22 2012 Josh Boyer +- Add patch to fix CIFS oops from Jeff Layton (rhbz 867344) + * Mon Oct 22 2012 Josh Boyer - 3.6.3-1 - CVE-2012-0957: uts: stack memory leak in UNAME26 (rhbz 862877 864824) - Fix rt2x00 usb reset resume (rhbz 856863)