diff options
Diffstat (limited to 'cpukit/rtems/src/partreturnbuffer.c')
| -rw-r--r-- | cpukit/rtems/src/partreturnbuffer.c | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/cpukit/rtems/src/partreturnbuffer.c b/cpukit/rtems/src/partreturnbuffer.c index f5ab7d85f9..82435e0e99 100644 --- a/cpukit/rtems/src/partreturnbuffer.c +++ b/cpukit/rtems/src/partreturnbuffer.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /** * @file * @@ -11,9 +13,26 @@ * COPYRIGHT (c) 1989-2014. * On-Line Applications Research Corporation (OAR). * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H @@ -33,7 +52,7 @@ static bool _Partition_Is_address_on_buffer_boundary( offset = _Addresses_Subtract( the_buffer, - the_partition->starting_address + the_partition->base_address ); return ( offset % the_partition->buffer_size ) == 0; @@ -44,14 +63,17 @@ static bool _Partition_Is_address_a_buffer_begin( const void *the_buffer ) { - void *starting; - void *ending; + const void *base; + const void *limit; - starting = the_partition->starting_address; - ending = _Addresses_Add_offset( starting, the_partition->length ); + base = the_partition->base_address; + limit = the_partition->limit_address; + + if ( !_Addresses_Is_in_range( the_buffer, base, limit ) ) { + return false; + } - return _Addresses_Is_in_range( the_buffer, starting, ending ) - && _Partition_Is_address_on_buffer_boundary( the_partition, the_buffer ); + return _Partition_Is_address_on_buffer_boundary( the_partition, the_buffer ); } static void _Partition_Free_buffer( |