Message ID | 1533157038-3924-24-git-send-email-bmarzins@redhat.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Delegated to: | christophe varoqui |
Headers | show
Return-Path: <dm-devel-bounces@redhat.com> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93DD0139A for <patchwork-dm-devel@patchwork.kernel.org>; Wed, 1 Aug 2018 20:59:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 870D42B7DB for <patchwork-dm-devel@patchwork.kernel.org>; Wed, 1 Aug 2018 20:59:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B5DB2B7E1; Wed, 1 Aug 2018 20:59:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3B8EF2B7DB for <patchwork-dm-devel@patchwork.kernel.org>; Wed, 1 Aug 2018 20:59:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FA65C047B63; Wed, 1 Aug 2018 20:59:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 32CD76E414; Wed, 1 Aug 2018 20:59:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EC66418037F3; Wed, 1 Aug 2018 20:59:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w71Kw8qM028177 for <dm-devel@listman.util.phx.redhat.com>; Wed, 1 Aug 2018 16:58:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 171FD1C668; Wed, 1 Aug 2018 20:58:08 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with SMTP id D95A81C664; Wed, 1 Aug 2018 20:58:05 +0000 (UTC) Received: by redhat.com (sSMTP sendmail emulation); Wed, 01 Aug 2018 15:58:05 -0500 From: "Benjamin Marzinski" <bmarzins@redhat.com> To: device-mapper development <dm-devel@redhat.com> Date: Wed, 1 Aug 2018 15:57:09 -0500 Message-Id: <1533157038-3924-24-git-send-email-bmarzins@redhat.com> In-Reply-To: <1533157038-3924-1-git-send-email-bmarzins@redhat.com> References: <1533157038-3924-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: dm-devel@redhat.com Cc: Martin Wilck <mwilck@suse.com> Subject: [dm-devel] [PATCH 23/32] libmultipath: _install_keyword cleanup X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development <dm-devel.redhat.com> List-Unsubscribe: <https://www.redhat.com/mailman/options/dm-devel>, <mailto:dm-devel-request@redhat.com?subject=unsubscribe> List-Archive: <https://www.redhat.com/archives/dm-devel> List-Post: <mailto:dm-devel@redhat.com> List-Help: <mailto:dm-devel-request@redhat.com?subject=help> List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>, <mailto:dm-devel-request@redhat.com?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 01 Aug 2018 20:59:05 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Misc Multipath patches
|
expand
|
diff --git a/libmultipath/parser.c b/libmultipath/parser.c index b8b7e0d..92ef7cf 100644 --- a/libmultipath/parser.c +++ b/libmultipath/parser.c @@ -79,12 +79,16 @@ _install_keyword(vector keywords, char *string, struct keyword *keyword; /* fetch last keyword */ - keyword = VECTOR_SLOT(keywords, VECTOR_SIZE(keywords) - 1); + keyword = VECTOR_LAST_SLOT(keywords); + if (!keyword) + return 1; /* position to last sub level */ - for (i = 0; i < sublevel; i++) - keyword = - VECTOR_SLOT(keyword->sub, VECTOR_SIZE(keyword->sub) - 1); + for (i = 0; i < sublevel; i++) { + keyword = VECTOR_LAST_SLOT(keyword->sub); + if (!keyword) + return 1; + } /* First sub level allocation */ if (!keyword->sub)
_install_keyword should use VECTOR_LAST_SLOT(), which has better error checking. It should also fail if it gets a NULL pointer, instead of dereferencing it. Found by coverity. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> --- libmultipath/parser.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)