yocto.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
From: Jason Andryuk <jandryuk@gmail.com>
To: yocto@lists.yoctoproject.org
Cc: Joe MacDonald <joe_macdonald@mentor.com>,
	Philip Tricca <flihp@twobit.us>, Yi Zhao <yi.zhao@windriver.com>,
	Jason Andryuk <jandryuk@gmail.com>
Subject: [meta-selinux][dunfell][PATCH 3/3] libselinux: Fix restorecon_set_sehandle.patch context
Date: Wed, 27 Oct 2021 10:03:57 -0400	[thread overview]
Message-ID: <20211027140357.66739-4-jandryuk@gmail.com> (raw)
In-Reply-To: <20211027140357.66739-1-jandryuk@gmail.com>

0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch added
in commit d6ff5a0e67af "libselinux: Backport NULL pointer fix from 3.1"
fails to apply because there is a extra level in the patch context.
The patch cannot apply and do_patch fails.  Fix the context so it builds
again.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
 ...-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-security/selinux/libselinux/0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch b/recipes-security/selinux/libselinux/0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch
index 8a9fb7c..f392f68 100644
--- a/recipes-security/selinux/libselinux/0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch
+++ b/recipes-security/selinux/libselinux/0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch
@@ -17,8 +17,8 @@ Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
 
 diff --git a/libselinux/src/selinux_restorecon.c b/libselinux/src/selinux_restorecon.c
 index d1ce830c5..6993be6fd 100644
---- a/libselinux/src/selinux_restorecon.c
-+++ b/libselinux/src/selinux_restorecon.c
+--- libselinux/src/selinux_restorecon.c
++++ libselinux/src/selinux_restorecon.c
 @@ -1154,6 +1154,8 @@ void selinux_restorecon_set_sehandle(struct selabel_handle *hndl)
  	size_t num_specfiles, fc_digest_len;
  
-- 
2.31.1



      parent reply	other threads:[~2021-10-27 14:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-27 14:03 [meta-selinux][dunfell][PATCH 0/3] Fix dunfell build Jason Andryuk
2021-10-27 14:03 ` [meta-selinux][dunfell][PATCH 1/3] e2fsprogs: Remove misc_create_inode.c-label_rootfs.patch Jason Andryuk
2021-10-27 14:03 ` [meta-selinux][dunfell][PATCH 2/3] Remove e2fsprogs override Jason Andryuk
2021-10-27 14:03 ` Jason Andryuk [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=20211027140357.66739-4-jandryuk@gmail.com \
    --to=jandryuk@gmail.com \
    --cc=flihp@twobit.us \
    --cc=joe_macdonald@mentor.com \
    --cc=yi.zhao@windriver.com \
    --cc=yocto@lists.yoctoproject.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;
as well as URLs for NNTP newsgroup(s).