mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-05-09 21:11:16 +00:00
Koen Kooi
2425d6e457
Readahead fixed! Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 85f2f3e05e8e0deec4fc8b751324f91acb276d21 Mon Sep 17 00:00:00 2001
|
|
From: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
|
|
Date: Thu, 2 Feb 2012 15:28:28 -0600
|
|
Subject: [PATCH 49/87] cifs: Fix oops in session setup code for null user
|
|
mounts
|
|
|
|
commit de47a4176c532ef5961b8a46a2d541a3517412d3 upstream.
|
|
|
|
For null user mounts, do not invoke string length function
|
|
during session setup.
|
|
|
|
Reported-and-Tested-by: Chris Clayton <chris2553@googlemail.com>
|
|
Acked-by: Jeff Layton <jlayton@redhat.com>
|
|
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
|
|
Signed-off-by: Steve French <smfrench@gmail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
fs/cifs/sess.c | 7 +++----
|
|
1 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
|
|
index 4ec3ee9..2504809 100644
|
|
--- a/fs/cifs/sess.c
|
|
+++ b/fs/cifs/sess.c
|
|
@@ -246,16 +246,15 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses,
|
|
/* copy user */
|
|
/* BB what about null user mounts - check that we do this BB */
|
|
/* copy user */
|
|
- if (ses->user_name != NULL)
|
|
+ if (ses->user_name != NULL) {
|
|
strncpy(bcc_ptr, ses->user_name, MAX_USERNAME_SIZE);
|
|
+ bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE);
|
|
+ }
|
|
/* else null user mount */
|
|
-
|
|
- bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE);
|
|
*bcc_ptr = 0;
|
|
bcc_ptr++; /* account for null termination */
|
|
|
|
/* copy domain */
|
|
-
|
|
if (ses->domainName != NULL) {
|
|
strncpy(bcc_ptr, ses->domainName, 256);
|
|
bcc_ptr += strnlen(ses->domainName, 256);
|
|
--
|
|
1.7.7.4
|
|
|