From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Benjamin Marzinski" Subject: [PATCH v3 08/19] libmultipath: _install_keyword cleanup Date: Fri, 21 Sep 2018 18:05:16 -0500 Message-ID: <1537571127-10143-9-git-send-email-bmarzins@redhat.com> References: <1537571127-10143-1-git-send-email-bmarzins@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1537571127-10143-1-git-send-email-bmarzins@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: device-mapper development Cc: Martin Wilck List-Id: dm-devel.ids _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 --- libmultipath/parser.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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) -- 2.7.4