mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 3.12-rc4] cifs: ntstatus_to_dos_map[] is not terminated
@ 2013-10-13 19:29 Tim Gardner
  2013-10-14  2:25 ` Steve French
  2013-10-14 15:38 ` Jeff Layton
  0 siblings, 2 replies; 3+ messages in thread
From: Tim Gardner @ 2013-10-13 19:29 UTC (permalink / raw)
  To: linux-cifs, samba-technical, linux-kernel; +Cc: Tim Gardner, Steve French

Functions that walk the ntstatus_to_dos_map[] array could
run off the end. For example, ntstatus_to_dos() loops
while ntstatus_to_dos_map[].ntstatus is not 0. Granted,
this is mostly theoretical, but could be used as a DOS attack
if the error code in the SMB header is bogus.

Cc: Steve French <sfrench@samba.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 fs/cifs/netmisc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index af847e1..651a527 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -780,7 +780,9 @@ static const struct {
 	ERRDOS, ERRnoaccess, 0xc0000290}, {
 	ERRDOS, ERRbadfunc, 0xc000029c}, {
 	ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
-	ERRDOS, ERRinvlevel, 0x007c0001}, };
+	ERRDOS, ERRinvlevel, 0x007c0001}, {
+	0, 0, 0 }
+};
 
 /*****************************************************************************
  Print an error message from the status code
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 3.12-rc4] cifs: ntstatus_to_dos_map[] is not terminated
  2013-10-13 19:29 [PATCH 3.12-rc4] cifs: ntstatus_to_dos_map[] is not terminated Tim Gardner
@ 2013-10-14  2:25 ` Steve French
  2013-10-14 15:38 ` Jeff Layton
  1 sibling, 0 replies; 3+ messages in thread
From: Steve French @ 2013-10-14  2:25 UTC (permalink / raw)
  To: Tim Gardner; +Cc: linux-cifs, samba-technical, LKML, Steve French

Merged into cifs-2.6.git

(for-next and for-linus branches)

Thoughts about suitability for stable anyone?

On Sun, Oct 13, 2013 at 2:29 PM, Tim Gardner <tim.gardner@canonical.com> wrote:
> Functions that walk the ntstatus_to_dos_map[] array could
> run off the end. For example, ntstatus_to_dos() loops
> while ntstatus_to_dos_map[].ntstatus is not 0. Granted,
> this is mostly theoretical, but could be used as a DOS attack
> if the error code in the SMB header is bogus.
>
> Cc: Steve French <sfrench@samba.org>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  fs/cifs/netmisc.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
> index af847e1..651a527 100644
> --- a/fs/cifs/netmisc.c
> +++ b/fs/cifs/netmisc.c
> @@ -780,7 +780,9 @@ static const struct {
>         ERRDOS, ERRnoaccess, 0xc0000290}, {
>         ERRDOS, ERRbadfunc, 0xc000029c}, {
>         ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
> -       ERRDOS, ERRinvlevel, 0x007c0001}, };
> +       ERRDOS, ERRinvlevel, 0x007c0001}, {
> +       0, 0, 0 }
> +};
>
>  /*****************************************************************************
>   Print an error message from the status code
> --
> 1.7.9.5
>



-- 
Thanks,

Steve

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 3.12-rc4] cifs: ntstatus_to_dos_map[] is not terminated
  2013-10-13 19:29 [PATCH 3.12-rc4] cifs: ntstatus_to_dos_map[] is not terminated Tim Gardner
  2013-10-14  2:25 ` Steve French
@ 2013-10-14 15:38 ` Jeff Layton
  1 sibling, 0 replies; 3+ messages in thread
From: Jeff Layton @ 2013-10-14 15:38 UTC (permalink / raw)
  To: Tim Gardner; +Cc: linux-cifs, samba-technical, linux-kernel, Steve French

On Sun, 13 Oct 2013 13:29:03 -0600
Tim Gardner <tim.gardner@canonical.com> wrote:

> Functions that walk the ntstatus_to_dos_map[] array could
> run off the end. For example, ntstatus_to_dos() loops
> while ntstatus_to_dos_map[].ntstatus is not 0. Granted,
> this is mostly theoretical, but could be used as a DOS attack
> if the error code in the SMB header is bogus.
> 
> Cc: Steve French <sfrench@samba.org>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  fs/cifs/netmisc.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
> index af847e1..651a527 100644
> --- a/fs/cifs/netmisc.c
> +++ b/fs/cifs/netmisc.c
> @@ -780,7 +780,9 @@ static const struct {
>  	ERRDOS, ERRnoaccess, 0xc0000290}, {
>  	ERRDOS, ERRbadfunc, 0xc000029c}, {
>  	ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
> -	ERRDOS, ERRinvlevel, 0x007c0001}, };
> +	ERRDOS, ERRinvlevel, 0x007c0001}, {
> +	0, 0, 0 }
> +};
>  
>  /*****************************************************************************
>   Print an error message from the status code

Nice catch.

Reviewed-by: Jeff Layton <jlayton@redhat.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-10-14 15:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-13 19:29 [PATCH 3.12-rc4] cifs: ntstatus_to_dos_map[] is not terminated Tim Gardner
2013-10-14  2:25 ` Steve French
2013-10-14 15:38 ` Jeff Layton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®