From patchwork Wed Sep 16 21:41:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Nosek X-Patchwork-Id: 11781029 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 423AD92C for ; Wed, 16 Sep 2020 21:42:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CB5DB221EF for ; Wed, 16 Sep 2020 21:42:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W95oKDiE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB5DB221EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E2EF990001A; Wed, 16 Sep 2020 17:42:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DB7FE900007; Wed, 16 Sep 2020 17:42:05 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C7F7B90001A; Wed, 16 Sep 2020 17:42:05 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0128.hostedemail.com [216.40.44.128]) by kanga.kvack.org (Postfix) with ESMTP id AD9FB900007 for ; Wed, 16 Sep 2020 17:42:05 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 6D949180AD811 for ; Wed, 16 Sep 2020 21:42:05 +0000 (UTC) X-FDA: 77270247810.30.trade11_5007d4b2711d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 3962C180B3AA7 for ; Wed, 16 Sep 2020 21:42:05 +0000 (UTC) X-Spam-Summary: 1,0,0,5aadb9b3c6c2f425,d41d8cd98f00b204,mateusznosek0@gmail.com,,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1260:1311:1314:1345:1437:1515:1534:1541:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:2693:3138:3139:3140:3141:3142:3352:3865:3868:3870:3871:3874:4385:5007:6261:6653:7514:7576:9413:10004:11026:11473:11658:11914:12043:12297:12438:12517:12519:12555:12679:12895:13069:13153:13161:13228:13229:13311:13357:13894:14181:14384:14394:14721:21080:21444:21451:21627:21666:21990:30054,0,RBL:209.85.167.65:@gmail.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04y8sy3p3ugkwujf31mthpfkx8femycpyf3qucde7mhean43g848ixcsu1939ig.mcmnzsunwz6ryztbyaoe45pg4gau94hknyjm7h6geumfeugbwf8abjq9f97xxpi.w-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: trade11_5007d4b2711d X-Filterd-Recvd-Size: 4502 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Wed, 16 Sep 2020 21:42:04 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id u8so8591059lff.1 for ; Wed, 16 Sep 2020 14:42:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VncGTmlGJZTO0vP8zn5c6pmOsTrbLikm9gWDwOKiU5w=; b=W95oKDiEQYylk5s66d1puFpGBg+lWGmOEyQtPeK7ynxG6fiy+7Yg2mgZQok1qNO+2W elKrf5apWMTlsZXUPl10huJeY45Wi6z2QVn+LrHPz2IBJUHJoCh+94+bdX7aNTAVhu/5 mECw6mtcwly98gZTucnhMCXGAUkIXNxg7oG6NujzL3ZnlNiGVZNp4G3tjH89qQQsLUn6 i04d7AYaFpvORxRdb6+q/j3UMg3ywfa833DUP2ZCZvcWuKbAlHwMKhNmwRHeyHm99H9O UCuoXZO61UZsnx9cg5FHYR8Igy+Pt9V5R/BJDXD9l+QWm0sM8dgdX4bXFci1HD8msLH+ +xlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VncGTmlGJZTO0vP8zn5c6pmOsTrbLikm9gWDwOKiU5w=; b=WoTJEGI4fBomvdxHh3IzesrEyspuiiyzcpcTysymyA+phEWBlkHX5X3FfHMLA5iAA8 TVepLj6Ro+D4kOYuaGo6v4ZZIuMlXW1y2j1sYQ6N4/gAbccBz7rE4W+tbwwwn/Yf/2qo yAExpjK2oj0qtmpj4G3t1LROurgUxH9kPK82IjZT0Li/heDIq4vnoDwL4JSS8/baRSvs GFduCsLzKo6PcxIMXwJCfFBUhrgxXFDnvjUNEz0+66AxLOsZ7ZWjwrJt9cKJoTMm/YHm Fi5EfAXDuqUuhDeTGHcsOnAGxhICL45JFVJXKYX3Tdju8On+gGBSdbWoco2Zwmu8dl/D 3dOw== X-Gm-Message-State: AOAM531XplcgJCvjoZrK/DpIfc0l/M8vAgL58AhsE6MSAJgYXx5FD2I3 k0J58MDtwjfvd83X04/9lEbHwGZS/IYGHg== X-Google-Smtp-Source: ABdhPJze3q2Ag0unqydwFw8KUefGFJFfPSxcdeTGFTTJbQq8KAAvyNZ40vJEFBE2yrq6jPDYkYgyLA== X-Received: by 2002:ac2:495a:: with SMTP id o26mr9320500lfi.94.1600292523014; Wed, 16 Sep 2020 14:42:03 -0700 (PDT) Received: from localhost.localdomain (188.147.112.12.nat.umts.dynamic.t-mobile.pl. [188.147.112.12]) by smtp.gmail.com with ESMTPSA id j28sm5153293lfk.97.2020.09.16.14.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 14:42:02 -0700 (PDT) From: mateusznosek0@gmail.com To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Mateusz Nosek , akpm@linux-foundation.org Subject: [PATCH] mm/page_alloc.c: fix early params garbage value accesses Date: Wed, 16 Sep 2020 23:41:25 +0200 Message-Id: <20200916214125.28271-1-mateusznosek0@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 3962C180B3AA7 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Mateusz Nosek Previously in '__init early_init_on_alloc' and '__init early_init_on_free' the return values from 'kstrtobool' were not handled properly. That caused potential garbage value read from variable 'bool_result'. Introduced patch fixes error handling. Signed-off-by: Mateusz Nosek --- mm/page_alloc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6b699d273d6e..112e5a63f9ca 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -155,16 +155,16 @@ static int __init early_init_on_alloc(char *buf) int ret; bool bool_result; - if (!buf) - return -EINVAL; ret = kstrtobool(buf, &bool_result); + if (ret) + return ret; if (bool_result && page_poisoning_enabled()) pr_info("mem auto-init: CONFIG_PAGE_POISONING is on, will take precedence over init_on_alloc\n"); if (bool_result) static_branch_enable(&init_on_alloc); else static_branch_disable(&init_on_alloc); - return ret; + return 0; } early_param("init_on_alloc", early_init_on_alloc); @@ -173,16 +173,16 @@ static int __init early_init_on_free(char *buf) int ret; bool bool_result; - if (!buf) - return -EINVAL; ret = kstrtobool(buf, &bool_result); + if (ret) + return ret; if (bool_result && page_poisoning_enabled()) pr_info("mem auto-init: CONFIG_PAGE_POISONING is on, will take precedence over init_on_free\n"); if (bool_result) static_branch_enable(&init_on_free); else static_branch_disable(&init_on_free); - return ret; + return 0; } early_param("init_on_free", early_init_on_free);