Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>,
        David Binderman <dcb314@hotmail.com>,
        Peng Zhang <zhangpeng.00@bytedance.com>
Subject: [PATCH v2 01/36] maple_tree: Fix static analyser cppcheck issue
Date:   Fri,  5 May 2023 13:41:29 -0400
Message-Id: <20230505174204.2665599-2-Liam.Howlett@oracle.com>
In-Reply-To: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
References: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?M5wW2raEKgyPH9xhWQAyAjzLQL+fHOwRerCaROBtB1GCcj/A/KeVQQ67yf20?=
 =?us-ascii?Q?eKein7DxP1d3ZVFDTqKFt/MhCsYnad5pLYPh1WkwlhnlpzJEHJoormswvGsV?=
 =?us-ascii?Q?JsYuJa47IZkjukg9JwRT9V5kaa/cq/RXjWfGacQ6MBDr5/IquSawhSmdvBb6?=
 =?us-ascii?Q?EwVYXNZY7bRWuAqZFaQ0rECkF62L+SksKJqeIti91EuMPN1n5LsgJlXvstoC?=
 =?us-ascii?Q?0Z6KY08T7V/90w0BzloqW+owZFElxqyDuuu+SzsdA6XCd+gPX62edtEzfGcu?=
 =?us-ascii?Q?rs/xhAbpoOHIqnwP+GNyhLd4TK88/veul6ARTZnJ2Ez04L3hgZdGNUWLG0Eg?=
 =?us-ascii?Q?wLoVQ+n8qQ7u5KhKxERsQOSDUlnJEHkUeBgfRUYQ8VLVF0sxOUE9IMFYyd21?=
 =?us-ascii?Q?S1c7sQqZfNlRhC21SMo3MNg8OQAsBMzwRDov9U0MsoCJ5cl94niuLE9T0djY?=
 =?us-ascii?Q?9MV4+NYacRAmPjGLlB93dDyYKy/BitQbTaLqBIyd31XmFweCIUFnvsRQB0Dy?=
 =?us-ascii?Q?f88/XFUKfw2c8V4HvS+W/e6BkrrtfuvhzVAqcNhK2k4dRf71K08w5osMNKo2?=
 =?us-ascii?Q?inEC9hsK9Gu1eIBjnnI+2aOSy4aahdB+o1buZLQtcty4iOVgnNkAP5J/b8YK?=
 =?us-ascii?Q?6yBbvkUn/2l+D/ZBk49sEOklGHcKYpOco556fK58qnMIEVcFHvUSCeeMDAuD?=
 =?us-ascii?Q?P7WzFWYOIt7ivBuRb4HLZqEP9seiv6558oKGqH+PdwuRlWrzBIsytOv2g//t?=
 =?us-ascii?Q?dT4EHl9h/Y2t7x4XaH3eWnPDii/iMM6Tjydg3PO6g2KmZfDbjdvqQ+lEBLsy?=
 =?us-ascii?Q?/0vmDjM/0m4WB81CrvgToT2qd9sjndMIwbA7sZ5S9KOI0XeKvU2ahXwKPne+?=
 =?us-ascii?Q?FvC3NbyycWkDlF1X9cllnsTepqqEPLxVKwv1neRxUL3ITZQHQCTcbYUP6Oxv?=
 =?us-ascii?Q?P/3Ui6qJAfQnSH1ohWlZBn7KxE/chZCb6RrsaolJMT2kxGjW5MBp7/eD7j/M?=
 =?us-ascii?Q?YqWMosqq6ItvCEfIbNCPeL99LRRyf2YbuLubcqcpTAXG+xWvmAgFUBWv0uDy?=
 =?us-ascii?Q?3FuaxPcnxUMMtVaJaXvnbfuK4O44t4JDAxqau9d/y0fujfEi6Jbd119wkI6S?=
 =?us-ascii?Q?8Zf9JxCODHj1cWsgdhoAqFGWcfOoxyqcIVIZHjYHe9nujqe+lL6afNouDfYx?=
 =?us-ascii?Q?V3qYFhh8kOWIs2Iats6UyIlfQr0/DwWfwHwLBmAFZS4csHSk30RxFgw9H+dP?=
 =?us-ascii?Q?5GGleUP2v1/M1SOTPp/OlCiaAnTDHlSBrScHyaeoZcasK3kg72FVUPceXkoA?=
 =?us-ascii?Q?dgjZXbVmdX8u6Td6ojtP/9GsUdpmGYYq+lOnnaWtKk94zgpNfkOH3I2FIAMu?=
 =?us-ascii?Q?A6z8W+i7XHHbemPYvHNEq4bNomIXvkqEyISJFOaHc4fYMQTJjaT/4nF8Y7nG?=
 =?us-ascii?Q?fWuhuV49cdIQRqZtCCTWKfwE7hJ9qmHGy2Huzm4a/Ql1vwDVIkMVWvaQvceG?=
 =?us-ascii?Q?UWIdx+2LoMrK4+U7dltAHj58J4Z9Q/02NOmK7yLpAJMIUi5GtaYLtRbYh1QV?=
 =?us-ascii?Q?Lk5pHP6j4l0KCQaWLNQn9+pTtUyfPCM2xFLYLdxAxf52ZbKohmd9r/rrSmpy?=
 =?us-ascii?Q?hQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?jj+XM+znr5KyVqMCuBAgZE1jNAHzH4Tqx459WxVvkfTGAnK5CXN0Cdj6C2nM?=
 =?us-ascii?Q?5vlzgcb6CTEl7/CzBHnvkCoVypUv26cx7+9XeXleXegen09vlImfzhFXkvAO?=
 =?us-ascii?Q?CXlMfvDfUmHVmoWZ3xHnbokQ689mVaHM6zPt6kudMJmujyM6Sy5JZvF31o5q?=
 =?us-ascii?Q?wgtpIgILs08ovmyXJMlgGgmAiQsA7F9XsuoniWCH3pfJfFdav/OdLK+e3z42?=
 =?us-ascii?Q?UN8xq0oFeu2RCe+e1JZ3twEzfJrrlxu6J8yPkKQn4bnhCnL1d18fXCT6iTuL?=
 =?us-ascii?Q?ijorAt5SaJG/hCzfXpngt3kXOMwLCXvrUcUeVaCjTG7nau05sR+e2aqqkOim?=
 =?us-ascii?Q?3nve3zAWAKLtysX6SEo9rckvefdVYXe2lqzTFtFts+7nKqi6Ftj1bEz/gR8g?=
 =?us-ascii?Q?C2QEP34UsYnKZ623N04zKfASP3X593Dhvgj11EsYytVMTY4otLk5LRo/Mkn4?=
 =?us-ascii?Q?BYE43GJ9zVJYYyg/0ELOGjfME8wNsGN2S0VkQth7UlAl2ra7N7C61Zlo9N8m?=
 =?us-ascii?Q?j0bBga0v2opdAsXRl4oAd7r/vxaib8tjFKXEjSojHmCIeU/5wGClTJPyY2fW?=
 =?us-ascii?Q?ycmpHcMfUCk4Fc8Bds/bxUwYjyxM1dLVzGvDDuYChUhmLZvHST7blcPWMSGc?=
 =?us-ascii?Q?sUIqCSOSdhBOUI5KFNR2DZXfirvx9VLaVuMXNQufpGdlO7/vM7MBpUbS6bW7?=
 =?us-ascii?Q?33EDGQBAV0Ayr8tBUDm8+e6VtWEwFNqZm+LSwSGGtIAutfbETIJVopCXPmRT?=
 =?us-ascii?Q?QeFEkE1Qj9WWrjdosUDl8aKdA/tlZiPUza/laPs1Eh++FRuyJbmU7Bgr5JeP?=
 =?us-ascii?Q?YxO6s5znQFgzJ93AVhBPyJD+q8rgh67mfUKHeSO17rnHGrS9m365tQbaztqe?=
 =?us-ascii?Q?OGupfSLsKcyMSwTzm7Rk/SKWgqQ3g3OHCVC2cdA7boWnYccSD9+szK9yAFg7?=
 =?us-ascii?Q?hodka9BeJoVU+4Z/+O0a7g=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 25fdad31-8e33-428c-e0e4-08db4d9044ec
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 17:43:43.1435
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9kmt97bm4KhIoXfaX+3gDkh0irWBzApfw1CJfP4gLkCMxoBMw2CCz0jQOyoci9cJmCzIT4CoEB4Yw6IOqXxf5A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6089
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-05_24,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 spamscore=0
 mlxlogscore=999 phishscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305050146
X-Proofpoint-GUID: pMvzGaO3rIQXOkPOgtlMkyif9g1N5z3f
X-Proofpoint-ORIG-GUID: pMvzGaO3rIQXOkPOgtlMkyif9g1N5z3f
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Static analyser of the maple tree code noticed that the split variable
is being used to dereference into an array prior to checking the
variable itself.  Fix this issue by changing the order of the statement
to check the variable first.

Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reviewed-by: Peng Zhang<zhangpeng.00@bytedance.com>
---
 lib/maple_tree.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 110a36479dced..9cf4fca42310c 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1943,8 +1943,9 @@ static inline int mab_calc_split(struct ma_state *mas,
 		 * causes one node to be deficient.
 		 * NOTE: mt_min_slots is 1 based, b_end and split are zero.
 		 */
-		while (((bn->pivot[split] - min) < slot_count - 1) &&
-		       (split < slot_count - 1) && (b_end - split > slot_min))
+		while ((split < slot_count - 1) &&
+		       ((bn->pivot[split] - min) < slot_count - 1) &&
+		       (b_end - split > slot_min))
 			split++;
 	}
 
-- 
2.39.2