mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* problem about 'git am --rej'
@ 2020-07-27 11:50 yangerkun
  2020-07-27 12:05 ` yangerkun
  0 siblings, 1 reply; 2+ messages in thread
From: yangerkun @ 2020-07-27 11:50 UTC (permalink / raw)
  To: git
  Cc: yangerkun, zhangyi (F), Kefeng Wang, Ye Bin, Zhen Lei, Jason Yan,
	Hou Tao


Trying 'git am --rej'(git version 2.25.4) to apply patch eead1c2ea250 
("netlabel: cope with NULL catmap") with linux stable branch 
it seems the patch has been applied with wrong function(should be 
cipso_v4_parsetag_rbm or cipso_v4_parsetag_rng, but 
cipso_v4_parsetag_enum). Does this a bug or a expected result?

[xxx@code-website linux-stable]$ git am 
0001-netlabel-cope-with-NULL-catmap.patch --rej
Applying: netlabel: cope with NULL catmap
Checking patch net/ipv4/cipso_ipv4.c...
Hunk #1 succeeded at 1435 (offset 177 lines).
error: while searching for:
                         return ret_val;

                 secattr->flags |= NETLBL_SECATTR_MLS_CAT;

         return 0;

error: patch failed: net/ipv4/cipso_ipv4.c:1439
Checking patch net/ipv6/calipso.c...
error: net/ipv6/calipso.c: does not exist in index
Checking patch net/netlabel/netlabel_kapi.c...
error: while searching for:
         if ((off & (BITS_PER_LONG - 1)) != 0)
                 return -EINVAL;

         if (off < catmap->startbit) {
                 off = catmap->startbit;
                 *offset = off;

error: patch failed: net/netlabel/netlabel_kapi.c:734
Applying patch net/ipv4/cipso_ipv4.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applying patch net/netlabel/netlabel_kapi.c with 1 reject...
Rejected hunk #1.
Patch failed at 0001 netlabel: cope with NULL catmap
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
[xxx@code-website linux-stable]$ git diff
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 0e83c5b08e0e..375733b96bdf 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -1435,7 +1435,8 @@ static int cipso_v4_parsetag_enum(const struct 
cipso_v4_doi *doi_def,
                         return ret_val;

-               secattr->flags |= NETLBL_SECATTR_MLS_CAT;
+               if (secattr->
+                       secattr->flags |= NETLBL_SECATTR_MLS_CAT;

         return 0;

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-07-27 12:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-27 11:50 problem about 'git am --rej' yangerkun
2020-07-27 12:05 ` yangerkun

Code repositories for project(s) associated with this public inbox

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 read-only IMAP folder(s) and NNTP newsgroup(s).