Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp3930452imm; Mon, 8 Oct 2018 11:52:40 -0700 (PDT) X-Google-Smtp-Source: ACcGV61nxjr93x+oZB9bXjdiF4OlFvP6dE9679jTMRg7cFRYwOnoCHylSz2nGCr8243qfAPKxafG X-Received: by 2002:a17:902:830a:: with SMTP id bd10-v6mr25393812plb.214.1539024760186; Mon, 08 Oct 2018 11:52:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539024760; cv=none; d=google.com; s=arc-20160816; b=bvL2hxS5MpLEJ5MhWDCZ912UeFd/f8ztn1Vq46NbxY4kIwFfEzSM9GaCFNVItCVxbA IvHXNLZMfv62duGJ2qjJQsG4mVLAWXsJVYUtqOZUiBfU4aFiTsaKb1Z8zaJmaCFxW/dk +935BHk+7njPJqI98eELeQH0mRnExfqtvM0FbTr0iPlHqMTF30+yrGelZdLUmwuuTBhy mLd0GZCn5V0Suy1r8/7N3gQbZZthJo/aQCMlS/kuzhDm5QZth/tEBa8Z2HfnI/lWGI+V zN561LRy/jhrYhXoCOhHhWwO5XEjoamtrW5kn+ets6SYhZeNcojhy5gDpDqJPOI5qMzr ONNw== 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=5VY+sUAW9aWD17kY9jzVnDY4cI2g9XVSWzxrg7OsgR8=; b=dIlIJyS01eEcHOsvNm1vZVu+GrI83Uu+RynCPQqAPpQ5Jgji1FWgneWRbYQPSGZlbA iszXenC6yqBSKnL6Mu5+t0hbRt8Cpf607Ssa04i4/cJfGhj5e3PlARu+KIhiTnMOnLRx wbZ7vN2jMIVykuIYnTlXo9LzPlVI9A4qEovvTuujlesIUs1DIqmVkMgXp16WuvBFOuDo dGxSPtarepQ5UW0bQPgO7xk6GhY9xxTc8WrsCznh6+dREgY9iKwaWHqExI5EukZLJyBG EWAQsWPHLjI0hb5xOQCrKsNIfCY7gW62SfgGdJTCYksnwiYdvkm4uYNolZfqsYLkk6O0 +Q3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=s7Hx7kur; 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 r24-v6si4001288pgv.380.2018.10.08.11.52.25; Mon, 08 Oct 2018 11:52:40 -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=s7Hx7kur; 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 S1732497AbeJICFZ (ORCPT + 99 others); Mon, 8 Oct 2018 22:05:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:55484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727260AbeJICFY (ORCPT ); Mon, 8 Oct 2018 22:05:24 -0400 Received: from localhost (ip-213-127-77-176.ip.prioritytelecom.net [213.127.77.176]) (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 249E3204FD; Mon, 8 Oct 2018 18:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1539024736; bh=yWtEXh+rqVE5W+5xSwyjkvxXPUef7qmXGDmd10ktSGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s7Hx7kurjhiZHU9xaLZJrRsNrtGAOKKxcouGVgQ9OuX7AL5E7giQAEPRwvQ+nMaUJ GUzXFcO/ss+XYiHWjDd9KgX64EdMnqKpHKKSl1WOVJA2GQro6iiTKSABu7fXeWy6xX kdRPwDoF0YGQxP7t1zzccbc3obz6K15HDq/UMH7w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenjia Zhang , Julian Wiedmann , "David S. Miller" , Sasha Levin Subject: [PATCH 4.18 136/168] s390/qeth: use vzalloc for QUERY OAT buffer Date: Mon, 8 Oct 2018 20:31:56 +0200 Message-Id: <20181008175625.213889200@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181008175620.043587728@linuxfoundation.org> References: <20181008175620.043587728@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wenjia Zhang [ Upstream commit aec45e857c5538664edb76a60dd452e3265f37d1 ] qeth_query_oat_command() currently allocates the kernel buffer for the SIOC_QETH_QUERY_OAT ioctl with kzalloc. So on systems with fragmented memory, large allocations may fail (eg. the qethqoat tool by default uses 132KB). Solve this issue by using vzalloc, backing the allocation with non-contiguous memory. Signed-off-by: Wenjia Zhang Reviewed-by: Julian Wiedmann Signed-off-by: Julian Wiedmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/s390/net/qeth_core_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -4738,7 +4739,7 @@ static int qeth_query_oat_command(struct priv.buffer_len = oat_data.buffer_len; priv.response_len = 0; - priv.buffer = kzalloc(oat_data.buffer_len, GFP_KERNEL); + priv.buffer = vzalloc(oat_data.buffer_len); if (!priv.buffer) { rc = -ENOMEM; goto out; @@ -4779,7 +4780,7 @@ static int qeth_query_oat_command(struct rc = -EFAULT; out_free: - kfree(priv.buffer); + vfree(priv.buffer); out: return rc; }