From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753521Ab1ABIB6 (ORCPT ); Sun, 2 Jan 2011 03:01:58 -0500 Received: from mail.windriver.com ([147.11.1.11]:34999 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753309Ab1ABHWo (ORCPT ); Sun, 2 Jan 2011 02:22:44 -0500 From: Paul Gortmaker To: stable@kernel.org, linux-kernel@vger.kernel.org Cc: stable-review@kernel.org, Jan Sembera , Ivan Kokshaysky , Al Viro , Richard Henderson , Andrew Morton , Linus Torvalds , Paul Gortmaker Subject: [34-longterm 071/260] binfmt_misc: fix binfmt_misc priority Date: Sun, 2 Jan 2011 02:16:07 -0500 Message-Id: <1293952756-15010-72-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 1.7.3.3 In-Reply-To: <1293952756-15010-1-git-send-email-paul.gortmaker@windriver.com> References: <1293952756-15010-1-git-send-email-paul.gortmaker@windriver.com> X-OriginalArrivalTime: 02 Jan 2011 07:21:24.0961 (UTC) FILETIME=[A9E2D510:01CBAA4D] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Sembera commit ee3aebdd8f5f8eac41c25c80ceee3d728f920f3b upstream. Commit 74641f584da ("alpha: binfmt_aout fix") (May 2009) introduced a regression - binfmt_misc is now consulted after binfmt_elf, which will unfortunately break ia32el. ia32 ELF binaries on ia64 used to be matched using binfmt_misc and executed using wrapper. As 32bit binaries are now matched by binfmt_elf before bindmt_misc kicks in, the wrapper is ignored. The fix increases precedence of binfmt_misc to the original state. Signed-off-by: Jan Sembera Cc: Ivan Kokshaysky Cc: Al Viro Cc: Richard Henderson Signed-off-by: Linus Torvalds Signed-off-by: Paul Gortmaker --- fs/binfmt_misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index c4e8353..42b60b0 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -723,7 +723,7 @@ static int __init init_misc_binfmt(void) { int err = register_filesystem(&bm_fs_type); if (!err) { - err = register_binfmt(&misc_format); + err = insert_binfmt(&misc_format); if (err) unregister_filesystem(&bm_fs_type); } -- 1.7.3.3