From patchwork Wed Jul 20 19:22:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9240327 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 392E3600CB for ; Wed, 20 Jul 2016 19:24:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AA6927C2C for ; Wed, 20 Jul 2016 19:24:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F42D27D64; Wed, 20 Jul 2016 19:24:42 +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 8839527C2C for ; Wed, 20 Jul 2016 19:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755105AbcGTTXa (ORCPT ); Wed, 20 Jul 2016 15:23:30 -0400 Received: from alt42.smtp-out.videotron.ca ([23.233.128.29]:3692 "EHLO alt42.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754655AbcGTTWt (ORCPT ); Wed, 20 Jul 2016 15:22:49 -0400 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id Px4xbXa666cTKPx4ybhar1; Wed, 20 Jul 2016 15:22:48 -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=tBb2bbeoAAAA:8 a=KLsVztuV4oJ-JjwXQ7gA:9 a=cvBusfyB2V15izCimMoJ:22 a=Oj-tNtZlA1e06AYgeCfH:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id E5B7C2DA069C; Wed, 20 Jul 2016 15:22:45 -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 v4 09/12] binfmt_flat: use clear_user() rather than memset() to clear .bss Date: Wed, 20 Jul 2016 15:22:38 -0400 Message-Id: <1469042561-7360-10-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469042561-7360-1-git-send-email-nicolas.pitre@linaro.org> References: <1469042561-7360-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfM0mXHQBxgP9lzjioSGtaOgxX2CiAMkTWsHYM7ekfNdtLhjxchlIJid3a7Qpin/2VPZGZj1fOYoODBD+iwNVncehdjNy3nLQH78rlAGXgMCl2csVJLy8 XBlITigA66nPOVOXkD4GgWMhTcO4rQPoA5W9N0l/UsI/byF18N88R3uvk+b3o9jxkEKPEoiiITfy1LXOM44auMqtWz9Bvdg1NH5EvNBl3v5x5TUXdTSPAloK 7hbpDpc2faEYNETfd3q4B88SwM7ao3oXVST7ZEnDRLWlhQ9cEqnITfZVwo8bKSQRd1l/XCdq11pjeFEMnke7Uw== 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 Reviewed-by: Greg Ungerer --- fs/binfmt_flat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 63756ca6a7..92c1530a2c 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -795,10 +795,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 + - (memp + memp_size - stack_len - /* end brk */ - libinfo->lib_list[id].start_brk) + /* start brk */ - stack_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)) + return -EFAULT; return 0; err: