From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75D5E139D for ; Sat, 11 Jan 2025 19:15:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736622958; cv=none; b=ctl8bHNQQokx3uoGefN+BAmAVIJBD2WdnuDMlmgxwGfjey45ZsW+zIU1aAhCWyuJeG3lhCiZ4MOdUwJOv4W567925eAze9yfeVA8sHDeWzQH89QGHE+NaF+72jcWqgXD9T8pQbtrgcvCRj3rnrANdgs2HXY187OEGRl7DKv4qxQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736622958; c=relaxed/simple; bh=4aaS2ZN/2AczE+ck1fp0ecEb1dHtwoFN2TfHpyKA4tE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=ViWyTHZ1/VWUGwbivwhHtg2369k8bMOvSZo5Gmq1u2Wi4uAVv8xOlVutXOpuEYlp8u4wwFfUnj1wqaqEebnbiaveLjTxNoxLbVf3vW7VNl1W1IEKaQplAvsubQzyRZtu+3nag3yfJb5NuOFziF8HB4QI1bVuUMlbzsLeQ1bGllc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bF0tSWIm; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bF0tSWIm" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4363ae65100so32486465e9.0 for ; Sat, 11 Jan 2025 11:15:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736622954; x=1737227754; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7RJ+gp/crtanIP2bJczYTt7wO6lF2ZkQqKWwaTKcAE8=; b=bF0tSWImlMM5WgeTlqwVBe9wOw0yh3C7eNzjcBy4AvEYJVdZsVrG18d1wgtSlldn5t FeznajXBot85PGvIBRLI9oooFXYMQlQgJSdEzLKvMj+ejmGNLhKh+DBze8zzLSeIAVsk mT94coO/E9kJWHWaV5o2D3oV4NpbQEMkDeYHbRKXU3sSd9tw4vW7rlTdKjRowEnlJNnb 4vbFX9WJl+ipEzfgxMnKNn3Q7C4g+N9QgLnNNGeqQaahdcHHWy2arJTUa1Yxh8m0Nwmz NLU0ca7FWCwKBCgVEYCR7oXcWB5kiewWY3di8jnX7wuS3pEBnNVTMInYR1UxmW+ISRzr E1Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736622954; x=1737227754; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7RJ+gp/crtanIP2bJczYTt7wO6lF2ZkQqKWwaTKcAE8=; b=wJgFS+IKbGFU0R6ZI58kkCFixk4BZvUVAVxetETdawuiuEKqW7J8NIA0bWbIgZjhwG FaPpAOriGI3rrhd9CiAKmKjm3kSjq51Zi4k9+RSQpoJ8LcMC+HP2FutkSRIKskla2vAX dkp8woa0Nwqb/lABjYEUmremu6MRUikqrv73jkRZT2ZzO6U4/1apbZh3oFulrOmkk2K5 7i3/p8h1BCcOjqh/azUaxLgB/UOVVqdwLHX9nxCsmfH73UDEoTl048gDY+fd7OxsmgKW deCwvQd+KsFufBWC4luI960Kw8FubfKH5hc1YKukwZK1OlkJtIs4//lwYV9eJ+3qYIZh mAFw== X-Gm-Message-State: AOJu0YwHVuH1yrB0guf9TGcSED2cd9+i76SH4SiGiiOY0jTJ0o7bwbWn tPGRzlEftyVJa2WlS++gGQsOISuPxSOEvIvYLB/UCNnh09jitpsaHWUHcnF4 X-Gm-Gg: ASbGncuaS/JVblFEEuqFRvNPrNjVh4QM1v6UyhBQl/824LfLL55KMs3UZKaHoSr7i1X clRKh+uYOAt2ktMSpIK0MCGQ6PqebVBlHzWG3d50NplceYGBoe0MFh5nFMoWofiqX2PDb0wsPO/ BHNVa9kyucbJ1ys3UaSb8K32BpbnBa6pOUdEDY8yxPB7oqrRRwO+0iEWWi2+86EAFUk0RMp3zhv qpuh4kF3zU0wy44cA1envw1M1ywlbhNxmbevazs5Xbsh+Lr+TZhhygjZ2cOXuKhmSYCnxC+rCVc 3YNTiGQGFuhutmrBykXx9Qg= X-Google-Smtp-Source: AGHT+IFH56nBCIEIupZlKRg6KPJXFnvPwHAqVAYKdSIKQjTd5XZe9ZDoFl+vT1YIVZM0Qe4imLAnpA== X-Received: by 2002:a05:6000:154f:b0:385:fd31:ca23 with SMTP id ffacd0b85a97d-38a87338c76mr15222420f8f.40.1736622953820; Sat, 11 Jan 2025 11:15:53 -0800 (PST) Received: from localhost.localdomain ([2a00:a041:e635:5000:b5a3:ad95:adb4:f994]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e4c3428sm7715032f8f.87.2025.01.11.11.15.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 11 Jan 2025 11:15:53 -0800 (PST) From: Yonatan Goldschmidt To: linux-kernel@vger.kernel.org Cc: Kees Cook , "Eric W. Biederman" , Yonatan Goldschmidt Subject: [PATCH] binfmt: Remove loader from linux_binprm struct Date: Sat, 11 Jan 2025 21:15:13 +0200 Message-Id: <20250111191513.15366-1-yon.goldschmidt@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 987f20a9dcce ("a.out: Remove the a.out implementation") removed the last in-tree user of the loader field, and as far as I can tell, it was the only one historically. Signed-off-by: Yonatan Goldschmidt --- Applies on e0daef7de1acec. fs/exec.c | 2 -- include/linux/binfmts.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 98cb7ba99..0e642f111 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -763,8 +763,6 @@ int setup_arg_pages(struct linux_binprm *bprm, mm->arg_start = bprm->p; #endif - if (bprm->loader) - bprm->loader -= stack_shift; bprm->exec -= stack_shift; if (mmap_write_lock_killable(mm)) diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index e6c00e860..3513e6fe7 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -57,7 +57,7 @@ struct linux_binprm { const char *fdpath; /* generated filename for execveat */ unsigned interp_flags; int execfd; /* File descriptor of the executable */ - unsigned long loader, exec; + unsigned long exec; struct rlimit rlim_stack; /* Saved RLIMIT_STACK used during exec. */ -- 2.39.5 (Apple Git-154)