Merged into cifs-2.6.git On Thu, Feb 2, 2012 at 3:28 PM, <[email protected]> wrote: > From: Shirish Pargaonkar <[email protected]> > > > For null user mounts, do not invoke string length function > during session setup. > > > Cc: <[email protected] > Reported-and-Tested-by: Chris Clayton <[email protected]> > Signed-off-by: Shirish Pargaonkar <[email protected]> > --- > 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 eb76741..551d0c2 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.6.0.2 >
-- Thanks, Steve -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
