From patchwork Wed Jul 20 19:22:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9240329 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 632E2600CB for ; Wed, 20 Jul 2016 19:24:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54A2927C2C for ; Wed, 20 Jul 2016 19:24:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4982F27D64; Wed, 20 Jul 2016 19:24:46 +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 ED3F827C2C for ; Wed, 20 Jul 2016 19:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755093AbcGTTX3 (ORCPT ); Wed, 20 Jul 2016 15:23:29 -0400 Received: from alt13.smtp-out.videotron.ca ([135.19.0.26]:34104 "EHLO alt12.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754678AbcGTTWt (ORCPT ); Wed, 20 Jul 2016 15:22:49 -0400 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id Px4vbh5ICq3HFPx4wb4WQ6; Wed, 20 Jul 2016 15:22:47 -0400 X-Authority-Analysis: v=2.1 cv=Q9lym9Ca 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=TjqNXoBTBnqrC5BxUBMA:9 a=cvBusfyB2V15izCimMoJ:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 61DE52DA05AD; 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 03/12] binfmt_flat: prevent kernel dammage from corrupted executable headers Date: Wed, 20 Jul 2016 15:22:32 -0400 Message-Id: <1469042561-7360-4-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: MS4wfA/Ac7cLKHRS/Bi+YUhAstEAy/WkWpFTa8D5fpEcPVppWjDHipZTvr5V5w+lMpMK3woWPkPvICdvPRpjOuFVxlO7IlNBNPIGdqBkgOEFA4Hl1hdK/yx6 QJ5uxIYo9x53/1L7cWJzHXhWDBgFNoUYacZjxeZ7UAG09y/lL95cQEhgNSxtK3mnOhDKcmcL+UsNqnAMPpc0JaHlbZSLPmQeajvcgPON2dGOif4D9Cbl+K3W 6vhEbKMSuuZOkES64v38He04P0u2bdOeXGpraX/uKsaChQOi8aJgc5WrVIy2Cx85T0YSRBbWHULUC5DusYtYEw== 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 Signed-off-by: Nicolas Pitre --- fs/binfmt_flat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index c3ccdefdea..03301bad1f 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -466,6 +466,17 @@ static int load_flat_file(struct linux_binprm *bprm, } /* + * Make sure the header params are sane. + * 28 bits (256 MB) is way more than reasonable in this case. + * If some top bits are set we have probable binary corruption. + */ + if ((text_len | data_len | bss_len | stack_len | full_data) >> 28) { + pr_err("bad header\n"); + ret = -ENOEXEC; + goto err; + } + + /* * fix up the flags for the older format, there were all kinds * of endian hacks, this only works for the simple cases */