Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp836995yba; Wed, 24 Apr 2019 10:23:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqyiLJedBTiKb9eyZl1SHtzrkOK8dEqTb8ncOh5QdL2+Apl8/seVWrOeUTlKgV3pGxEwbnHp X-Received: by 2002:a17:902:4381:: with SMTP id j1mr33233468pld.173.1556126594700; Wed, 24 Apr 2019 10:23:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556126594; cv=none; d=google.com; s=arc-20160816; b=r6e3+3rJ8DjUX9VvxCC5wHloeQ25oP4q0HsYOpI9ibEkvAysyAbW7CqnfdF6QOZvto z9nZO+AJrL1Dn1Zz533NOGE49WquzIRyEAIgfsQ48X25dVx+/VeA7hDOSNydLZ9/yo/J vXVgAt7HCGVTixcvQ8gRYibH9VBlHVZOJE15QprV6Ip6bQZY7IdYePSsf5n/EKcqZnPf QA3qA6D2fcI3ffdIF6IEVPAdqatVU8zjdfvO/TB2S3fSRFRX1GwErKrWxcZ6th95QYWY X7pdZHcaGWf7I+Qi7DdNkxVSYUMZbbVjyF3M3PI238Mq182omvawSxJjlrkqQXMFcQK+ ooGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZKqzdyriTAcIye5zg3snf/+RZk6cTd26ny47P+vYVaw=; b=WXvX+perohZTMNuUU+JxE4GKCp+ZOwDPfclGueYOn9S/vJY3fM0KyLXgelHhT5aQgq zQ6xQ2KJr1DEx2/Csqg9mClQPJ4TduQbqmRuFMhOm+LhiCheTVkOQiuTBQVPI90s1q3k uZ+1ApQwHGEyGguqoOWTGjbzXlqlj4cFxtZvnNKC9fR6UItTDVWtwO80BvBCOR5R3Ijj SWoqmlPVcNF3Cte9Gc0JU4Q6XdL2JabpExdDvT+i+r0isnZTJYwhgzN/S+AgkDQp2Tx2 3uJAF5aGdYMazRsvPrPq6jTPTJAXJpMJAnHLY8MLBRkaI6rMsgtD4KhMaFCMXtgT/42y CkMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fHH5l+3l; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p16si5333195plq.315.2019.04.24.10.22.59; Wed, 24 Apr 2019 10:23:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fHH5l+3l; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388631AbfDXRUI (ORCPT + 99 others); Wed, 24 Apr 2019 13:20:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:45436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388488AbfDXRUH (ORCPT ); Wed, 24 Apr 2019 13:20:07 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 894B7205ED; Wed, 24 Apr 2019 17:20:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126403; bh=mTJrMbc6Gv05gm2p9P/9C6siabrpryr8zrGHqRBAy3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fHH5l+3lrjZyeokQ31X5WBAkjNBnzDLsZMqyqC47SePhrtK39YgeDi7ZAjwl8WNLQ Iam+qb18NPdPIAXtwRFPI+hhpcXyNBJYrfP9lGRbSVNbRKIg0PEXmm8rh1zfe4C/HR THXaq5aQhFxXpq6o4aqBEeebEBmx43nGvaV3e1fg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Coly Li , Jens Axboe , Sasha Levin Subject: [PATCH 4.4 046/168] bcache: fix input overflow to cache set sysfs file io_error_halflife Date: Wed, 24 Apr 2019 19:08:10 +0200 Message-Id: <20190424170926.522591722@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit a91fbda49f746119828f7e8ad0f0aa2ab0578f65 ] Cache set sysfs entry io_error_halflife is used to set c->error_decay. c->error_decay is in type unsigned int, and it is converted by strtoul_or_return(), therefore overflow to c->error_decay is possible for a large input value. This patch fixes the overflow by using strtoul_safe_clamp() to convert input string to an unsigned long value in range [0, UINT_MAX], then divides by 88 and set it to c->error_decay. Signed-off-by: Coly Li Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/md/bcache/sysfs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c index 5a5c1f1bd8a5..87daccbbc61b 100644 --- a/drivers/md/bcache/sysfs.c +++ b/drivers/md/bcache/sysfs.c @@ -645,8 +645,17 @@ STORE(__bch_cache_set) c->error_limit = strtoul_or_return(buf) << IO_ERROR_SHIFT; /* See count_io_errors() for why 88 */ - if (attr == &sysfs_io_error_halflife) - c->error_decay = strtoul_or_return(buf) / 88; + if (attr == &sysfs_io_error_halflife) { + unsigned long v = 0; + ssize_t ret; + + ret = strtoul_safe_clamp(buf, v, 0, UINT_MAX); + if (!ret) { + c->error_decay = v / 88; + return size; + } + return ret; + } sysfs_strtoul(journal_delay_ms, c->journal_delay_ms); sysfs_strtoul(verify, c->verify); -- 2.19.1