]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
cifs: fix possible memory corruption in CIFSFindNext
authorJeff Layton <jlayton@redhat.com>
Tue, 23 Aug 2011 11:21:28 +0000 (07:21 -0400)
committerWilly Tarreau <w@1wt.eu>
Sat, 11 Feb 2012 14:37:41 +0000 (15:37 +0100)
commit 9438fabb73eb48055b58b89fc51e0bc4db22fabd upstream.

The name_len variable in CIFSFindNext is a signed int that gets set to
the resume_name_len in the cifs_search_info. The resume_name_len however
is unsigned and for some infolevels is populated directly from a 32 bit
value sent by the server.

If the server sends a very large value for this, then that value could
look negative when converted to a signed int. That would make that
value pass the PATH_MAX check later in CIFSFindNext. The name_len would
then be used as a length value for a memcpy. It would then be treated
as unsigned again, and the memcpy scribbles over a ton of memory.

Fix this by making the name_len an unsigned value in CIFSFindNext.

Reported-by: Darren Lavender <dcl@hppine99.gbr.hp.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Willy Tarreau <w@1wt.eu>
fs/cifs/cifssmb.c

index 31a1668c1a0919f262c3c681e5fc1186e63ccfcb..b59e175fe6df0499fbc2fa41d406d97a0814d4ee 100644 (file)
@@ -3649,7 +3649,8 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,
        T2_FNEXT_RSP_PARMS *parms;
        char *response_data;
        int rc = 0;
-       int bytes_returned, name_len;
+       int bytes_returned;
+       unsigned int name_len;
        __u16 params, byte_count;
 
        cFYI(1, ("In FindNext"));