]> git.karo-electronics.de Git - karo-tx-linux.git/commit
cifs: check for NULL last_entry before calling cifs_save_resume_key
authorJeff Layton <jlayton@redhat.com>
Fri, 2 Dec 2011 01:23:34 +0000 (20:23 -0500)
committerSteve French <smfrench@gmail.com>
Sat, 3 Dec 2011 05:05:30 +0000 (23:05 -0600)
commit138514bc5c12b1f5b5bb3c292cc669a219249544
tree6aac4d2bbaae57306fa320beb4282c380171a8e2
parenta8c03a6c24b7115698e04746caed9717f096140a
cifs: check for NULL last_entry before calling cifs_save_resume_key

Prior to commit eaf35b1, cifs_save_resume_key had some NULL pointer
checks at the top. It turns out that at least one of those NULL
pointer checks is needed after all.

When the LastNameOffset in a FIND reply appears to be beyond the end of
the buffer, CIFSFindFirst and CIFSFindNext will set srch_inf.last_entry
to NULL. Since eaf35b1, the code will now oops in this situation.

Fix this by having the callers check for a NULL last entry pointer
before calling cifs_save_resume_key. No change is needed for the
call site in cifs_readdir as it's not reachable with a NULL
current_entry pointer.

This should fix:

    https://bugzilla.redhat.com/show_bug.cgi?id=750247

Cc: stable@vger.kernel.org
Cc: Christoph Hellwig <hch@infradead.org>
Reported-by: Adam G. Metzler <adamgmetzler@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
fs/cifs/readdir.c