Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2869858pxu; Sat, 19 Dec 2020 04:52:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZXj+YevPmMfSNb/AT7Lo8vb6+LfkzKa5KBPQ0tjToFPdVwM3E4OaJSlp8rF3Kgbmz1X++ X-Received: by 2002:a17:906:2755:: with SMTP id a21mr2718703ejd.374.1608382327014; Sat, 19 Dec 2020 04:52:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608382327; cv=none; d=google.com; s=arc-20160816; b=eWuPn8wLMdriEscY+ZPa8CHI3oSyr5J8imQQNUV20G6w6MdtCZU4yap3Iu82jE38Lm syyCBw5wmquVumqrvwoUO2lFLbRjDtU3M3XHJEzlxuF4Q5GU/nKtTBBXYP1UDA8E43+K zBxDKlM7u1Kjz/O+U4zNu6SrC+egwyYOjjGYRFfpRSB2vjhcuxXKcZnlnGcxswcWndR6 jJouT8uz9gdYNkTwnEEcafuKopAeQc9AafPzeOa60Qeuu5B/TJrUwJmlnuy9IDG7ykKH +b8OQUh4XmgYxOq0oeF9FjP/Q6v6IXc24/41qr+UqyHPHaSdmCUt6zbN+E+h78tFV58T oUTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=j8a4k5RlDXwtvVUe9P+JgNp4ToEjZHJkr8OKztXXaZs=; b=sKDYkXr1B5kSN4qKhvVCYUsBhTvNWRdd1ykcokVIq3svy5OHbDLj59VX9wy/mZWMvx dEdZZRDhpyxWhnLapUbjwC71a9KPAEzZ05xrfsMGEFFm8o6qMrY36Sro7daW2/L4s7JZ 4FIy4hk+hQefgELjK6yROrjTaGUuVQr5GYIo6FqG9NutJBA19ayZ6BoOo7phIk9604/X FJ2T17r87bGGW0JeCOinl2YrUpQees+cN6O6TdsM+f06ZkovmgScfA/KBYaOEqLaVrk+ Csuh0a+ekWlTz8/c4qJ70ofHf/R8EdExx+VIC/KO/Hes8JVoB0leDTzo2VHK1CS4xGuo bhdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t6si7836710edq.353.2020.12.19.04.51.45; Sat, 19 Dec 2020 04:52:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726564AbgLSMuF (ORCPT + 99 others); Sat, 19 Dec 2020 07:50:05 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:9540 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726478AbgLSMuE (ORCPT ); Sat, 19 Dec 2020 07:50:04 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CylsN006Bzhtyl; Sat, 19 Dec 2020 20:48:39 +0800 (CST) Received: from use12-sp2.huawei.com (10.67.189.20) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.498.0; Sat, 19 Dec 2020 20:49:13 +0800 From: Jubin Zhong To: , , CC: , , Subject: [PATCH] ubi: remove dead code in validate_vid_hdr() Date: Sat, 19 Dec 2020 20:49:10 +0800 Message-ID: <1608382150-102703-1-git-send-email-zhongjubin@huawei.com> X-Mailer: git-send-email 1.8.5.6 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.189.20] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org data_size is already checked against zero when vol_type matches UBI_VID_STATIC. Remove the following dead code. Signed-off-by: Jubin Zhong --- drivers/mtd/ubi/io.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index 2f3312c..8a7306c 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -913,12 +913,7 @@ static int validate_vid_hdr(const struct ubi_device *ubi, ubi_err(ubi, "bad data_size"); goto bad; } - } else if (lnum == used_ebs - 1) { - if (data_size == 0) { - ubi_err(ubi, "bad data_size at last LEB"); - goto bad; - } - } else { + } else if (lnum > used_ebs - 1) { ubi_err(ubi, "too high lnum"); goto bad; } -- 1.8.5.6