]> xenbits.xensource.com Git - people/royger/xen.git/commitdiff
xen/common: Add NUMA node id bounds check to page_alloc.c/node_to_scrub
authorShawn Anastasio <sanastasio@raptorengineering.com>
Tue, 26 Sep 2023 22:37:39 +0000 (17:37 -0500)
committerStefano Stabellini <stefano.stabellini@amd.com>
Wed, 27 Sep 2023 23:28:55 +0000 (16:28 -0700)
When building for Power with CONFIG_DEBUG unset, a compiler error gets
raised inside page_alloc.c's node_to_scrub function:

common/page_alloc.c: In function 'node_to_scrub.part.0':
common/page_alloc.c:1217:29: error: array subscript 1 is above array
            bounds of 'long unsigned int[1]' [-Werror=array-bounds]
 1217 |         if ( node_need_scrub[node] )

It appears that this is a false positive, given that in practice
cycle_node should never return a node ID >= MAX_NUMNODES as long as the
architecture's node_online_map is properly defined and initialized, so
this additional bounds check is only to satisfy GCC.

Signed-off-by: Shawn Anastasio <sanastasio@raptorengineering.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
xen/common/page_alloc.c

index 35d9a26fa6ec7810a540811d9658fda9d96abf79..9b5df74fddabbfac7923058fcd14ff3a8d8f11c0 100644 (file)
@@ -1211,6 +1211,14 @@ static unsigned int node_to_scrub(bool get_node)
         } while ( !cpumask_empty(&node_to_cpumask(node)) &&
                   (node != local_node) );
 
+        /*
+         * In practice `node` will always be within MAX_NUMNODES, but GCC can't
+         * always see that, so an explicit check is necessary to avoid tripping
+         * its out-of-bounds array access warning (-Warray-bounds).
+         */
+        if ( node >= MAX_NUMNODES )
+            break;
+
         if ( node == local_node )
             break;