| From b4789b8e6be3151a955ade74872822f30e8cd914 Mon Sep 17 00:00:00 2001 |
| From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com> |
| Date: Thu, 31 Oct 2013 14:01:02 +0530 |
| Subject: aacraid: prevent invalid pointer dereference |
| |
| From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com> |
| |
| commit b4789b8e6be3151a955ade74872822f30e8cd914 upstream. |
| |
| It appears that driver runs into a problem here if fibsize is too small |
| because we allocate user_srbcmd with fibsize size only but later we |
| access it until user_srbcmd->sg.count to copy it over to srbcmd. |
| |
| It is not correct to test (fibsize < sizeof(*user_srbcmd)) because this |
| structure already includes one sg element and this is not needed for |
| commands without data. So, we would recommend to add the following |
| (instead of test for fibsize == 0). |
| |
| Signed-off-by: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com> |
| Reported-by: Nico Golde <nico@ngolde.de> |
| Reported-by: Fabian Yamaguchi <fabs@goesec.de> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Kees Cook <keescook@chromium.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/aacraid/commctrl.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/scsi/aacraid/commctrl.c |
| +++ b/drivers/scsi/aacraid/commctrl.c |
| @@ -511,7 +511,8 @@ static int aac_send_raw_srb(struct aac_d |
| goto cleanup; |
| } |
| |
| - if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr))) { |
| + if ((fibsize < (sizeof(struct user_aac_srb) - sizeof(struct user_sgentry))) || |
| + (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))) { |
| rcode = -EINVAL; |
| goto cleanup; |
| } |
