Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1243060 > unrolled thread

[patch 2/2] misc: mic/scif: fix wrap around tests

Started byDan Carpenter <dan.carpenter@oracle.com>
First post2015-10-09 08:50 +0200
Last post2015-10-14 20:10 +0200
Articles 5 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [patch 2/2] misc: mic/scif: fix wrap around tests Dan Carpenter <dan.carpenter@oracle.com> - 2015-10-09 08:50 +0200
    Re: [patch 2/2] misc: mic/scif: fix wrap around tests Sudeep Dutt <sudeep.dutt@intel.com> - 2015-10-11 11:20 +0200
      Re: [patch 2/2] misc: mic/scif: fix wrap around tests Dan Carpenter <dan.carpenter@oracle.com> - 2015-10-13 15:00 +0200
    Re: [patch 2/2] misc: mic/scif: fix wrap around tests Sudeep Dutt <sudeep.dutt@intel.com> - 2015-10-14 05:30 +0200
      Re: [patch 2/2] misc: mic/scif: fix wrap around tests Dan Carpenter <dan.carpenter@oracle.com> - 2015-10-14 20:10 +0200

#1243060 — [patch 2/2] misc: mic/scif: fix wrap around tests

FromDan Carpenter <dan.carpenter@oracle.com>
Date2015-10-09 08:50 +0200
Subject[patch 2/2] misc: mic/scif: fix wrap around tests
Message-ID<qhzF8-2KD-15@gated-at.bofh.it>
Signed integer overflow is undefined.  Also I added a check for
"(offset < 0)" in scif_unregister() because that makes it match the
other conditions and because I didn't want to subtract a negative.

Fixes: ba612aa8b487 ('misc: mic: SCIF memory registration and unregistration')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---

Imagine you are on 64 bit and len is larger than INT_MAX << 12, it means
that we truncate it because scif_get_window_offset() takes an integer
argument.  I don't know if this is an issue.  Maybe I should use
INT_MAX instead of LONG_MAX?  I am working on a static checker warning
for these types of issues:
drivers/misc/mic/scif/scif_rma.c:1631 scif_register() warn: truncating user data 'len >> 12' '0-4503599627370495'
drivers/misc/mic/scif/scif_rma.c:1643 scif_register() warn: truncating user data 'len >> 12' '0-4503599627370495'

The other static warnings here are:

drivers/misc/mic/scif/scif_rma.c:745 scif_unregister_window() warn: inconsistent returns 'mutex:&ep->rma_info.rma_lock'.
  Locked on:   line 745
  Unlocked on: line 687
drivers/misc/mic/scif/scif_rma.c:1463 scif_unpin_pages() warn: passing __func__ while the format string already contains the name of the function 'scif_unpin_pages'

diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c
index bc2dccb..fea7d2c 100644
--- a/drivers/misc/mic/scif/scif_rma.c
+++ b/drivers/misc/mic/scif/scif_rma.c
@@ -1510,7 +1510,7 @@ off_t scif_register_pinned_pages(scif_epd_t epd,
 	if ((map_flags & SCIF_MAP_FIXED) &&
 	    ((ALIGN(offset, PAGE_SIZE) != offset) ||
 	    (offset < 0) ||
-	    (offset + (off_t)len < offset)))
+	    (len > LONG_MAX - offset)))
 		return -EINVAL;
 
 	might_sleep();
@@ -1613,7 +1613,7 @@ off_t scif_register(scif_epd_t epd, void *addr, size_t len, off_t offset,
 	if ((map_flags & SCIF_MAP_FIXED) &&
 	    ((ALIGN(offset, PAGE_SIZE) != offset) ||
 	    (offset < 0) ||
-	    (offset + (off_t)len < offset)))
+	    (len < LONG_MAX - offset)))
 		return -EINVAL;
 
 	/* Unsupported protection requested */
@@ -1731,7 +1731,8 @@ scif_unregister(scif_epd_t epd, off_t offset, size_t len)
 
 	/* Offset is not page aligned or offset+len wraps around */
 	if ((ALIGN(offset, PAGE_SIZE) != offset) ||
-	    (offset + (off_t)len < offset))
+	    (offset < 0) ||
+	    (len > LONG_MAX - offset))
 		return -EINVAL;
 
 	err = scif_verify_epd(ep);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1244081

FromSudeep Dutt <sudeep.dutt@intel.com>
Date2015-10-11 11:20 +0200
Message-ID<qikXo-3XV-9@gated-at.bofh.it>
In reply to#1243060
On Fri, 2015-10-09 at 09:40 +0300, Dan Carpenter wrote:
> Signed integer overflow is undefined.  Also I added a check for
> "(offset < 0)" in scif_unregister() because that makes it match the
> other conditions and because I didn't want to subtract a negative.
> 
> Fixes: ba612aa8b487 ('misc: mic: SCIF memory registration and unregistration')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> 
> Imagine you are on 64 bit and len is larger than INT_MAX << 12, it means
> that we truncate it because scif_get_window_offset() takes an integer
> argument.  I don't know if this is an issue. 

scif_get_window_offset(..) takes an integer argument for the number of
pages. We believe that an int for number of 4K pages is sufficient for
current systems. I don't think there is an issue here.

>  Maybe I should use
> INT_MAX instead of LONG_MAX?  I am working on a static checker warning
> for these types of issues:
> drivers/misc/mic/scif/scif_rma.c:1631 scif_register() warn: truncating user data 'len >> 12' '0-4503599627370495'
> drivers/misc/mic/scif/scif_rma.c:1643 scif_register() warn: truncating user data 'len >> 12' '0-4503599627370495'
> 
> The other static warnings here are:
> 
> drivers/misc/mic/scif/scif_rma.c:745 scif_unregister_window() warn: inconsistent returns 'mutex:&ep->rma_info.rma_lock'.
>   Locked on:   line 745
>   Unlocked on: line 687

The function expects the lock to be held by the caller so there is no
issue here.

> drivers/misc/mic/scif/scif_rma.c:1463 scif_unpin_pages() warn: passing __func__ while the format string already contains the name of the function 'scif_unpin_pages'
> 

It might be useful to enhance checkpatch to catch such issues.

> diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c
> index bc2dccb..fea7d2c 100644
> --- a/drivers/misc/mic/scif/scif_rma.c
> +++ b/drivers/misc/mic/scif/scif_rma.c
> @@ -1510,7 +1510,7 @@ off_t scif_register_pinned_pages(scif_epd_t epd,
>  	if ((map_flags & SCIF_MAP_FIXED) &&
>  	    ((ALIGN(offset, PAGE_SIZE) != offset) ||
>  	    (offset < 0) ||
> -	    (offset + (off_t)len < offset)))
> +	    (len > LONG_MAX - offset)))
>  		return -EINVAL;
>  
>  	might_sleep();
> @@ -1613,7 +1613,7 @@ off_t scif_register(scif_epd_t epd, void *addr, size_t len, off_t offset,
>  	if ((map_flags & SCIF_MAP_FIXED) &&
>  	    ((ALIGN(offset, PAGE_SIZE) != offset) ||
>  	    (offset < 0) ||
> -	    (offset + (off_t)len < offset)))
> +	    (len < LONG_MAX - offset)))

Why is this change required? The earlier code was being used to detect
wraparound and I think it works fine.

Thanks,
Sudeep Dutt

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1245681

FromDan Carpenter <dan.carpenter@oracle.com>
Date2015-10-13 15:00 +0200
Message-ID<qj7lo-728-1@gated-at.bofh.it>
In reply to#1244081
On Sun, Oct 11, 2015 at 02:14:44AM -0700, Sudeep Dutt wrote:
> On Fri, 2015-10-09 at 09:40 +0300, Dan Carpenter wrote:
> > Signed integer overflow is undefined.  Also I added a check for
> > "(offset < 0)" in scif_unregister() because that makes it match the
> > other conditions and because I didn't want to subtract a negative.
> > 
> > Fixes: ba612aa8b487 ('misc: mic: SCIF memory registration and unregistration')
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > 
> > Imagine you are on 64 bit and len is larger than INT_MAX << 12, it means
> > that we truncate it because scif_get_window_offset() takes an integer
> > argument.  I don't know if this is an issue. 
> 
> scif_get_window_offset(..) takes an integer argument for the number of
> pages. We believe that an int for number of 4K pages is sufficient for
> current systems. I don't think there is an issue here.

The issue isn't that we need more pages, it's that we can overflow
INT_MAX so scif_get_window_offset() succeeds when it should fail.

> 
> >  Maybe I should use
> > INT_MAX instead of LONG_MAX?  I am working on a static checker warning
> > for these types of issues:
> > drivers/misc/mic/scif/scif_rma.c:1631 scif_register() warn: truncating user data 'len >> 12' '0-4503599627370495'
> > drivers/misc/mic/scif/scif_rma.c:1643 scif_register() warn: truncating user data 'len >> 12' '0-4503599627370495'
> > 
> > The other static warnings here are:
> > 
> > drivers/misc/mic/scif/scif_rma.c:745 scif_unregister_window() warn: inconsistent returns 'mutex:&ep->rma_info.rma_lock'.
> >   Locked on:   line 745
> >   Unlocked on: line 687
> 
> The function expects the lock to be held by the caller so there is no
> issue here.
> 

You're missing the point.  Never mind, I will send a patch for this.

> > @@ -1613,7 +1613,7 @@ off_t scif_register(scif_epd_t epd, void *addr, size_t len, off_t offset,
> >  	if ((map_flags & SCIF_MAP_FIXED) &&
> >  	    ((ALIGN(offset, PAGE_SIZE) != offset) ||
> >  	    (offset < 0) ||
> > -	    (offset + (off_t)len < offset)))
> > +	    (len < LONG_MAX - offset)))
> 
> Why is this change required? The earlier code was being used to detect
> wraparound and I think it works fine.

It doesn't work.  off_t is a signed type so it's undefined.  The
compiler will often just remove the condition.

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1246275

FromSudeep Dutt <sudeep.dutt@intel.com>
Date2015-10-14 05:30 +0200
Message-ID<qjkVk-2Hm-11@gated-at.bofh.it>
In reply to#1243060
On Fri, 2015-10-09 at 09:40 +0300, Dan Carpenter wrote:
> Signed integer overflow is undefined.  Also I added a check for
> "(offset < 0)" in scif_unregister() because that makes it match the
> other conditions and because I didn't want to subtract a negative.
> 
> Fixes: ba612aa8b487 ('misc: mic: SCIF memory registration and unregistration')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> 
> Imagine you are on 64 bit and len is larger than INT_MAX << 12, it means
> that we truncate it because scif_get_window_offset() takes an integer
> argument.  I don't know if this is an issue.  Maybe I should use
> INT_MAX instead of LONG_MAX?  I am working on a static checker warning
> for these types of issues:
> drivers/misc/mic/scif/scif_rma.c:1631 scif_register() warn: truncating user data 'len >> 12' '0-4503599627370495'
> drivers/misc/mic/scif/scif_rma.c:1643 scif_register() warn: truncating user data 'len >> 12' '0-4503599627370495'
> 
> The other static warnings here are:
> 
> drivers/misc/mic/scif/scif_rma.c:745 scif_unregister_window() warn: inconsistent returns 'mutex:&ep->rma_info.rma_lock'.
>   Locked on:   line 745
>   Unlocked on: line 687
> drivers/misc/mic/scif/scif_rma.c:1463 scif_unpin_pages() warn: passing __func__ while the format string already contains the name of the function 'scif_unpin_pages'
> 
> diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c
> index bc2dccb..fea7d2c 100644
> --- a/drivers/misc/mic/scif/scif_rma.c
> +++ b/drivers/misc/mic/scif/scif_rma.c
> @@ -1510,7 +1510,7 @@ off_t scif_register_pinned_pages(scif_epd_t epd,
>  	if ((map_flags & SCIF_MAP_FIXED) &&
>  	    ((ALIGN(offset, PAGE_SIZE) != offset) ||
>  	    (offset < 0) ||
> -	    (offset + (off_t)len < offset)))
> +	    (len > LONG_MAX - offset)))
>  		return -EINVAL;
>  
>  	might_sleep();
> @@ -1613,7 +1613,7 @@ off_t scif_register(scif_epd_t epd, void *addr, size_t len, off_t offset,
>  	if ((map_flags & SCIF_MAP_FIXED) &&
>  	    ((ALIGN(offset, PAGE_SIZE) != offset) ||
>  	    (offset < 0) ||
> -	    (offset + (off_t)len < offset)))
> +	    (len < LONG_MAX - offset)))

Hi Dan,
Should this be > instead of < like the others?
Thanks,
Sudeep Dutt

>  		return -EINVAL;
>  
>  	/* Unsupported protection requested */
> @@ -1731,7 +1731,8 @@ scif_unregister(scif_epd_t epd, off_t offset, size_t len)
>  
>  	/* Offset is not page aligned or offset+len wraps around */
>  	if ((ALIGN(offset, PAGE_SIZE) != offset) ||
> -	    (offset + (off_t)len < offset))
> +	    (offset < 0) ||
> +	    (len > LONG_MAX - offset))
>  		return -EINVAL;
>  
>  	err = scif_verify_epd(ep);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1247050

FromDan Carpenter <dan.carpenter@oracle.com>
Date2015-10-14 20:10 +0200
Message-ID<qjyEX-6jb-25@gated-at.bofh.it>
In reply to#1246275
On Tue, Oct 13, 2015 at 08:21:24PM -0700, Sudeep Dutt wrote:

> > @@ -1613,7 +1613,7 @@ off_t scif_register(scif_epd_t epd, void *addr, size_t len, off_t offset,
> >  	if ((map_flags & SCIF_MAP_FIXED) &&
> >  	    ((ALIGN(offset, PAGE_SIZE) != offset) ||
> >  	    (offset < 0) ||
> > -	    (offset + (off_t)len < offset)))
> > +	    (len < LONG_MAX - offset)))
> 
> Hi Dan,
> Should this be > instead of < like the others?

Gar.  You're right, obviously.  Thanks.  I will resend tomorrow.

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web