public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, mic@digikod.net
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6.y] landlock: Add the errata interface
Date: Sat, 19 Apr 2025 07:47:27 -0400	[thread overview]
Message-ID: <20250418162926-e6673f6e7a64da72@stable.kernel.org> (raw)
In-Reply-To: <20250418092249.1989854-1-mic@digikod.net>

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it

Found matching upstream commit: 15383a0d63dbcd63dc7e8d9ec1bf3a0f7ebf64ac

Status in newer kernel trees:
6.14.y | Present (different SHA1: 728f62bff8a0)
6.13.y | Present (different SHA1: be73220526b7)
6.12.y | Present (different SHA1: ed390ad1458c)

Note: The patch differs from the upstream commit:
---
1:  15383a0d63dbc ! 1:  9908f3355915b landlock: Add the errata interface
    @@ Commit message
         Cc: Günther Noack <gnoack@google.com>
         Cc: stable@vger.kernel.org
         Link: https://lore.kernel.org/r/20250318161443.279194-3-mic@digikod.net
    +    (cherry picked from commit 15383a0d63dbcd63dc7e8d9ec1bf3a0f7ebf64ac)
         Signed-off-by: Mickaël Salaün <mic@digikod.net>
     
      ## include/uapi/linux/landlock.h ##
    @@ security/landlock/setup.c
     +#include <linux/bits.h>
      #include <linux/init.h>
      #include <linux/lsm_hooks.h>
    - #include <uapi/linux/lsm.h>
      
      #include "common.h"
      #include "cred.h"
     +#include "errata.h"
      #include "fs.h"
    - #include "net.h"
    + #include "ptrace.h"
      #include "setup.h"
     @@ security/landlock/setup.c: struct lsm_blob_sizes landlock_blob_sizes __ro_after_init = {
      	.lbs_superblock = sizeof(struct landlock_superblock_security),
    @@ security/landlock/setup.c: struct lsm_blob_sizes landlock_blob_sizes __ro_after_
      {
     +	compute_errata();
      	landlock_add_cred_hooks();
    - 	landlock_add_task_hooks();
    + 	landlock_add_ptrace_hooks();
      	landlock_add_fs_hooks();
     
      ## security/landlock/setup.h ##
    @@ security/landlock/setup.h
     +extern int landlock_errata;
      
      extern struct lsm_blob_sizes landlock_blob_sizes;
    - extern const struct lsm_id landlock_lsmid;
    + 
     
      ## security/landlock/syscalls.c ##
     @@ security/landlock/syscalls.c: static const struct file_operations ruleset_fops = {
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y        |  Success    |  Success   |

      reply	other threads:[~2025-04-19 11:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-17 13:39 FAILED: patch "[PATCH] landlock: Add the errata interface" failed to apply to 6.6-stable tree gregkh
2025-04-18  9:22 ` [PATCH 6.6.y] landlock: Add the errata interface Mickaël Salaün
2025-04-19 11:47   ` Sasha Levin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250418162926-e6673f6e7a64da72@stable.kernel.org \
    --to=sashal@kernel.org \
    --cc=mic@digikod.net \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox