Merge branch 'f17' of ssh://pkgs.fedoraproject.org/kernel into f17
This commit is contained in:
commit
b71c8a4360
|
@ -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);
|
||||
|
|
@ -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
|
||||
|
@ -2338,6 +2344,9 @@ fi
|
|||
- VIFO fails on ARM at the moment so disable it for the time being
|
||||
|
||||
* Mon Oct 22 2012 Josh Boyer <jwboyer@redhat.com>
|
||||
- Add patch to fix CIFS oops from Jeff Layton (rhbz 867344)
|
||||
|
||||
* Mon Oct 22 2012 Josh Boyer <jwboyer@redhat.com> - 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
|
||||
|
|
Loading…
Reference in New Issue