How to go about mixing kernel patches...

How to go about mixing kernel patches...

[JW]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I hope no one minds to mposting this here, if you do, flame away.

My first difficulty it appling the SE Linux patch to the SuSE-patched kernel.

I applied lsm-2.4-2002050211.patch.gz to vanila 2.4.18 and they apply perfectly.

I applied it to linux-2.4.18-SuSE and got some errors, producing the following rejects:

linux-2.4.18.SuSE/fs/dquot.c.rej
linux-2.4.18.SuSE/fs/namei.c.rej
linux-2.4.18.SuSE/fs/inode.c.rej
linux-2.4.18.SuSE/mm/memory.c.rej
linux-2.4.18.SuSE/mm/mprotect.c.rej
linux-2.4.18.SuSE/mm/filemap.c.rej
linux-2.4.18.SuSE/net/socket.c.rej
linux-2.4.18.SuSE/arch/i386/kernel/entry.S.rej
linux-2.4.18.SuSE/arch/ia64/kernel/entry.S.rej
linux-2.4.18.SuSE/init/main.c.rej
linux-2.4.18.SuSE/kernel/fork.c.rej
linux-2.4.18.SuSE/kernel/sched.c.rej
linux-2.4.18.SuSE/Makefile.rej
linux-2.4.18.SuSE/include/linux/fs.h.rej

Or if this helps any:

jw:/work/dl/se_linux/se_build/linux-2.4.18.SuSE # zcat ../../opt5/all-opt-4-together/patches/lsm-2.4-2002050211.patch.gz | patch -s -p1
1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej
1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/entry.S.rej
1 out of 1 hunk FAILED -- saving rejects to file arch/ia64/kernel/entry.S.rej
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
1 out of 1 hunk ignored -- saving rejects to file fs/binfmt_elf.c.rej
1 out of 2 hunks FAILED -- saving rejects to file fs/dquot.c.rej
1 out of 3 hunks FAILED -- saving rejects to file fs/inode.c.rej
1 out of 22 hunks FAILED -- saving rejects to file fs/namei.c.rej
1 out of 6 hunks FAILED -- saving rejects to file include/linux/fs.h.rej
1 out of 2 hunks FAILED -- saving rejects to file init/main.c.rej
1 out of 4 hunks FAILED -- saving rejects to file kernel/fork.c.rej
1 out of 7 hunks FAILED -- saving rejects to file kernel/sched.c.rej
1 out of 3 hunks FAILED -- saving rejects to file mm/filemap.c.rej
1 out of 1 hunk FAILED -- saving rejects to file mm/memory.c.rej
1 out of 2 hunks FAILED -- saving rejects to file mm/mprotect.c.rej
1 out of 15 hunks FAILED -- saving rejects to file net/socket.c.rej


At this point I'm presuming the the correct course of action is to diff those files one at a time between the "good" patched {.c|.h} files and the "bad" suse-patched {.c|.h} files.

Would there be any benefit to try to do the opposite, i.e. apply the LSM patches first, and the SuSE patches second?

I'm a little worried since I have to mix 3 patches actually. I suppose there's not much chance of the actual se-linux patches applying to my mixed lsm/suse kernel?

Sorry to ask such basic questions, I've never had to do something like this before -- but I'm detirmined to do it right.

If any one has advise as far as how to go about this, I'd really appreciate hearing from you.

Thanks!

- -- 

- ----------------------------------------------------
Jonathan Wilson
System Administrator
Cedar Creek Software     http://www.cedarcreeksoftware.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE8+DQCQ5u80xXOLBcRAoBCAKC7v3Ta7boFkXltryIjtOj1wohx5ACfesN3
LLlU60flwIRnTs4Ylkon2RU=
=ALT7
-----END PGP SIGNATURE-----


--
You have received this message because you are subscribed to the selinux list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: How to go about mixing kernel patches...

[Russell Coker]

On Sat, 1 Jun 2002 04:39, JW wrote:
> I hope no one minds to mposting this here, if you do, flame away.
>
> My first difficulty it appling the SE Linux patch to the SuSE-patched
> kernel.
>
> I applied lsm-2.4-2002050211.patch.gz to vanila 2.4.18 and they apply
> perfectly.
>
> I applied it to linux-2.4.18-SuSE and got some errors, producing the
> following rejects:

Probably the best thing to do is use the upstream kernel instead of the SuSE 
patched one.

Also you could look around the SuSE site for a list of patch files that they 
use, and select the few that are relevant to you instead of the many that 
conflict with SE Linux.

NB  XFS and LSM patches conflict...

-- 
I do not get viruses because I do not use MS software.
If you use Outlook then please do not put my email address in your
address-book so that WHEN you get a virus it won't use my address in the
>From field.

--
You have received this message because you are subscribed to the selinux list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.