diff mbox

cifs: update limit for snprintf() in cifs_construct_tcon()

Message ID CAH2r5mu6TuWs6P8ZeR1=KCv8BLSu0_Z8b2uoVUqXhw55=39CWg@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Steve French July 12, 2011, 6:14 p.m. UTC 
What about the following alternative, so we dont rely on the magic
number as much.

 	vol_info->linux_uid = fsuid;

On Fri, Jun 17, 2011 at 5:31 AM, Dan Carpenter <error27@gmail.com> wrote:
> In 34c87901e113 "Shrink stack space usage in cifs_construct_tcon" we
> change the size of the username name buffer from MAX_USERNAME_SIZE
> (256) to 28.  This call to snprintf() needs to be updated as well.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> ---
> I know that everyone is going to complain about using a literal but
> it's local to this function and it's commented in the lines above.
> I'm not opposed to using a define, I suppose, if you give me a good
> one, but really I'd just as soon leave it as is.  *eye roll in
> advance*.
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 12cf72d..efd1c7a 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -3451,7 +3451,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
>                goto out;
>        }
>
> -       snprintf(username, MAX_USERNAME_SIZE, "krb50x%x", fsuid);
> +       snprintf(username, 28, "krb50x%x", fsuid);
>        vol_info->username = username;
>        vol_info->local_nls = cifs_sb->local_nls;
>        vol_info->linux_uid = fsuid;
>

Comments

Jeremy Allison July 12, 2011, 6:16 p.m. UTC | #1 
On Tue, Jul 12, 2011 at 01:14:00PM -0500, Steve French wrote:
> What about the following alternative, so we dont rely on the magic
> number as much.

Steve,

	Where is my transport level encryption ?

This is your weekly ping from me on this :-).

Just so you don't forget.. :-).

Jeremy.
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dan Carpenter July 12, 2011, 6:20 p.m. UTC | #2 
On Tue, Jul 12, 2011 at 01:14:00PM -0500, Steve French wrote:
> What about the following alternative, so we dont rely on the magic
> number as much.
> 

Yeah.  That's better.  Want me to do anything or will you just give
me the reported-by?

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index dbd669c..ccc1afa 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3485,7 +3485,7 @@  cifs_construct_tcon(struct cifs_sb_info
*cifs_sb, uid_t fsuid)
 		goto out;
 	}

-	snprintf(username, MAX_USERNAME_SIZE, "krb50x%x", fsuid);
+	snprintf(username, sizeof(username), "krb50x%x", fsuid);
 	vol_info->username = username;
 	vol_info->local_nls = cifs_sb->local_nls;