acl: fix undefined behavior of bit shifts

[dpdk.git] / lib / librte_acl / acl_bld.c

diff --git a/lib/librte_acl/acl_bld.c b/lib/librte_acl/acl_bld.c
index 9e5ad1c..b06bbe9 100644 (file)
--- a/lib/librte_acl/acl_bld.c
+++ b/lib/librte_acl/acl_bld.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   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.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <rte_acl.h>
@@ -349,7 +320,7 @@ acl_add_ptr_range(struct acl_build_context *context,
        for (n = 0; n < UINT8_MAX + 1; n++)
                if (n >= low && n <= high)
                        bitset.bits[n / (sizeof(bits_t) * 8)] |=
-                               1 << (n % (sizeof(bits_t) * 8));
+                               1U << (n % (sizeof(bits_t) * CHAR_BIT));
 
        return acl_add_ptr(context, root, node, &bitset);
 }
@@ -372,7 +343,7 @@ acl_gen_mask(struct rte_acl_bitset *bitset, uint32_t value, uint32_t mask)
                if ((n & mask) == value) {
                        range++;
                        bitset->bits[n / (sizeof(bits_t) * 8)] |=
-                               1 << (n % (sizeof(bits_t) * 8));
+                               1U << (n % (sizeof(bits_t) * CHAR_BIT));
                }
        }
        return range;
@@ -830,8 +801,8 @@ acl_gen_range_trie(struct acl_build_context *context,
 {
        int32_t n;
        struct rte_acl_node *root;
-       const uint8_t *lo = (const uint8_t *)min;
-       const uint8_t *hi = (const uint8_t *)max;
+       const uint8_t *lo = min;
+       const uint8_t *hi = max;
 
        *pend = acl_alloc_node(context, level+size);
        root = acl_alloc_node(context, level++);
@@ -886,8 +857,8 @@ acl_gen_mask_trie(struct acl_build_context *context,
        struct rte_acl_node *root;
        struct rte_acl_node *node, *prev;
        struct rte_acl_bitset bits;
-       const uint8_t *val = (const uint8_t *)value;
-       const uint8_t *msk = (const uint8_t *)mask;
+       const uint8_t *val = value;
+       const uint8_t *msk = mask;
 
        root = acl_alloc_node(context, level++);
        prev = root;
@@ -1001,7 +972,7 @@ build_trie(struct acl_build_context *context, struct rte_acl_build_rule *head,
                                sizeof(*end->mrt));
 
                for (m = context->cfg.num_categories; 0 != m--; ) {
-                       if (rule->f->data.category_mask & (1 << m)) {
+                       if (rule->f->data.category_mask & (1U << m)) {
                                end->mrt->results[m] = rule->f->data.userdata;
                                end->mrt->priority[m] = rule->f->data.priority;
                        } else {