From patchwork Wed Nov 21 16:45:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Borowski X-Patchwork-Id: 10692819 Return-Path: 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 3C7F01751 for ; Wed, 21 Nov 2018 16:45:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C3A62C2BC for ; Wed, 21 Nov 2018 16:45:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F4A82C346; Wed, 21 Nov 2018 16:45:23 +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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C69942C2BC for ; Wed, 21 Nov 2018 16:45:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730742AbeKVDU3 (ORCPT ); Wed, 21 Nov 2018 22:20:29 -0500 Received: from tartarus.angband.pl ([54.37.238.230]:57278 "EHLO tartarus.angband.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbeKVDU2 (ORCPT ); Wed, 21 Nov 2018 22:20:28 -0500 Received: from [2a02:a31c:853f:a300::6] (helo=umbar.angband.pl) by tartarus.angband.pl with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gPVco-0001vc-5v; Wed, 21 Nov 2018 17:45:15 +0100 Received: from kilobyte by umbar.angband.pl with local (Exim 4.91) (envelope-from ) id 1gPVcn-0007Wl-D6; Wed, 21 Nov 2018 17:45:13 +0100 From: Adam Borowski To: David Sterba , linux-btrfs@vger.kernel.org Cc: Adam Borowski Date: Wed, 21 Nov 2018 17:45:10 +0100 Message-Id: <20181121164511.28875-1-kilobyte@angband.pl> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a02:a31c:853f:a300::6 X-SA-Exim-Mail-From: kilobyte@angband.pl Subject: [PATCH RESEND 1/2] btrfs-progs: fix kernel version parsing on some versions past 3.0 X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on tartarus.angband.pl) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The code fails if the third section is missing (like "4.18") or is followed by anything but "." or "-". This happens for example if we're not exactly at a tag and CONFIG_LOCALVERSION_AUTO=n (which results in "4.18.5+"). Signed-off-by: Adam Borowski --- fsfeatures.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fsfeatures.c b/fsfeatures.c index 7d85d60f..66111bf4 100644 --- a/fsfeatures.c +++ b/fsfeatures.c @@ -216,11 +216,8 @@ u32 get_running_kernel_version(void) return (u32)-1; version |= atoi(tmp) << 8; tmp = strtok_r(NULL, ".", &saveptr); - if (tmp) { - if (!string_is_numerical(tmp)) - return (u32)-1; + if (tmp && string_is_numerical(tmp)) version |= atoi(tmp); - } return version; }