From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 041F1C43218 for ; Sun, 28 Apr 2019 11:02:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCC1F206BF for ; Sun, 28 Apr 2019 11:02:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726659AbfD1LCw (ORCPT ); Sun, 28 Apr 2019 07:02:52 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:46500 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726317AbfD1LCw (ORCPT ); Sun, 28 Apr 2019 07:02:52 -0400 Received: from localhost (unknown [IPv6:2605:8d80:523:7f9b:667e:c07a:4564:ffd6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: krisman) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 8E287270D92; Sun, 28 Apr 2019 12:02:49 +0100 (BST) From: Gabriel Krisman Bertazi To: Masahiro Yamada Cc: Olaf Weber , Gabriel Krisman Bertazi , "Theodore Ts'o" , Michal Marek , Linux Kbuild mailing list , Colin King , kernel-janitors@vger.kernel.org, Linux Kernel Mailing List Subject: Re: [PATCH][next] unicode: fix dereference of a potentially null pointer Organization: Collabora References: <20190426222237.13209-1-colin.king@canonical.com> Date: Sun, 28 Apr 2019 07:02:45 -0400 In-Reply-To: (Masahiro Yamada's message of "Sat, 27 Apr 2019 15:29:30 +0900") Message-ID: <85ef5mcrze.fsf@collabora.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Masahiro Yamada writes: > Forwarding because this file is not in my tree. > > > > > > On Sat, Apr 27, 2019 at 7:22 AM Colin King wrote: >> >> From: Colin Ian King >> >> The pointer 'tree' is deferenced when assigning pointer 'trie', however >> trie is being null checked a few lines later, so it could potentially >> be null. Fix the potential null pointer dereference by only dereferencing >> it after it has been null checked. >> >> Addresses-Coverity: ("Dereference before null check") >> Fixes: b08fcacaaaf4 ("unicode: introduce UTF-8 character database") >> Signed-off-by: Colin Ian King Acked-by: Gabriel Krisman Bertazi Ted, can you pick this up directly for now? >> --- >> scripts/mkutf8data.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/scripts/mkutf8data.c b/scripts/mkutf8data.c >> index 12ce94b43be6..0563ba679bbb 100644 >> --- a/scripts/mkutf8data.c >> +++ b/scripts/mkutf8data.c >> @@ -2706,7 +2706,7 @@ static utf8leaf_t *utf8hangul(const char *str, unsigned char *hangul) >> static utf8leaf_t *utf8nlookup(struct tree *tree, unsigned char *hangul, >> const char *s, size_t len) >> { >> - utf8trie_t *trie = utf8data + tree->index; >> + utf8trie_t *trie; >> int offlen; >> int offset; >> int mask; >> @@ -2716,6 +2716,7 @@ static utf8leaf_t *utf8nlookup(struct tree *tree, unsigned char *hangul, >> return NULL; >> if (len == 0) >> return NULL; >> + trie = utf8data + tree->index; >> node = 1; >> while (node) { >> offlen = (*trie & OFFLEN) >> OFFLEN_SHIFT; >> -- >> 2.20.1 >> > > > -- > Best Regards > Masahiro Yamada -- Gabriel Krisman Bertazi