From patchwork Mon Jul 18 03:31:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9234009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 49E506089D for ; Mon, 18 Jul 2016 03:33:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DE7A254F7 for ; Mon, 18 Jul 2016 03:33:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 329E126C2F; Mon, 18 Jul 2016 03:33:51 +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=-6.9 required=2.0 tests=BAYES_00,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 C6C8F26AE3 for ; Mon, 18 Jul 2016 03:33:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751725AbcGRDcb (ORCPT ); Sun, 17 Jul 2016 23:32:31 -0400 Received: from alt42.smtp-out.videotron.ca ([23.233.128.29]:10447 "EHLO alt42.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751447AbcGRDcM (ORCPT ); Sun, 17 Jul 2016 23:32:12 -0400 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id OzHubOJ5J6cTKOzHvbcen4; Sun, 17 Jul 2016 23:32:11 -0400 X-Authority-Analysis: v=2.1 cv=TfA2zUkh c=1 sm=1 tr=0 a=keA3yYpnlypCNW5BNWqu+w==:117 a=keA3yYpnlypCNW5BNWqu+w==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=cAmyUtKerLwA:10 a=KKAkSRfTAAAA:8 a=0uNKG0NQF1f1rLkwhCQA:9 a=cvBusfyB2V15izCimMoJ:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id B8ABD2DA0692; Sun, 17 Jul 2016 23:32:08 -0400 (EDT) From: Nicolas Pitre To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alexander Viro , David Howells , Greg Ungerer Subject: [PATCH v2 07/10] binfmt_flat: use clear_user() rather than memset() to clear .bss Date: Sun, 17 Jul 2016 23:31:53 -0400 Message-Id: <1468812716-30537-8-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468812716-30537-1-git-send-email-nicolas.pitre@linaro.org> References: <1468812716-30537-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfPgnUF8BpuqBKY6LxNgOUNkEyU4CZIGzcRlzMvyTSSB/WSr920wrZexjCPHyiuIpcTyJwZmaiprsLQQUbEJ1WAqBl7S0gbh8IXMdJlZ8siC1JWxyUkbL +GTrJ+wWNhQP5zTlo1Ox0eqcTYb6Oxs53qNMPs4aAsI/SlY8A+irrQH230YxBFRnDF5BEiL9uXLoxt8QIqFSxnSfvq/Ff7ZOBi1rL1ohfwVK6g+Sh4nsg5s7 9H6Nom81y1yXh+/GHqFgYndhJ7wC+nCHebqthv+LVT5JV1a8m8uwtZN4pIM4B3TQfZzZiJVc15dE1iB3/QNfWQ== Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is needed on systems with a MMU. Signed-off-by: Nicolas Pitre --- fs/binfmt_flat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index c85f8f1239..e981e66bb5 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -803,10 +803,11 @@ static int load_flat_file(struct linux_binprm * bprm, flush_icache_range(start_code, end_code); /* zero the BSS, BRK and stack areas */ - memset((void*)(datapos + data_len), 0, bss_len + + if (clear_user((void __user *)(datapos + data_len), bss_len + (memp + memp_size - stack_len - /* end brk */ libinfo->lib_list[id].start_brk) + /* start brk */ - stack_len); + stack_len)) + return -EFAULT; return 0; err: