/[linux-patches]/genpatches-2.6/trunk/2.6.12-pre/1008_linux-2.6.11.9.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12-pre/1008_linux-2.6.11.9.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 4 - (show annotations) (download) (as text)
Sat Jun 11 23:20:41 2005 UTC (15 years, 5 months ago) by dsd
File MIME type: text/x-diff
File size: 5025 byte(s)
Create 2.6.12 branch
1 diff -Nru a/Documentation/SecurityBugs b/Documentation/SecurityBugs
2 --- /dev/null Wed Dec 31 16:00:00 196900
3 +++ b/Documentation/SecurityBugs 2005-05-11 15:43:56 -07:00
4 @@ -0,0 +1,38 @@
5 +Linux kernel developers take security very seriously. As such, we'd
6 +like to know when a security bug is found so that it can be fixed and
7 +disclosed as quickly as possible. Please report security bugs to the
8 +Linux kernel security team.
9 +
10 +1) Contact
11 +
12 +The Linux kernel security team can be contacted by email at
13 +<security@kernel.org>. This is a private list of security officers
14 +who will help verify the bug report and develop and release a fix.
15 +It is possible that the security team will bring in extra help from
16 +area maintainers to understand and fix the security vulnerability.
17 +
18 +As it is with any bug, the more information provided the easier it
19 +will be to diagnose and fix. Please review the procedure outlined in
20 +REPORTING-BUGS if you are unclear about what information is helpful.
21 +Any exploit code is very helpful and will not be released without
22 +consent from the reporter unless it has already been made public.
23 +
24 +2) Disclosure
25 +
26 +The goal of the Linux kernel security team is to work with the
27 +bug submitter to bug resolution as well as disclosure. We prefer
28 +to fully disclose the bug as soon as possible. It is reasonable to
29 +delay disclosure when the bug or the fix is not yet fully understood,
30 +the solution is not well-tested or for vendor coordination. However, we
31 +expect these delays to be short, measurable in days, not weeks or months.
32 +A disclosure date is negotiated by the security team working with the
33 +bug submitter as well as vendors. However, the kernel security team
34 +holds the final say when setting a disclosure date. The timeframe for
35 +disclosure is from immediate (esp. if it's already publically known)
36 +to a few weeks. As a basic default policy, we expect report date to
37 +disclosure date to be on the order of 7 days.
38 +
39 +3) Non-disclosure agreements
40 +
41 +The Linux kernel security team is not a formal body and therefore unable
42 +to enter any non-disclosure agreements.
43 diff -Nru a/MAINTAINERS b/MAINTAINERS
44 --- a/MAINTAINERS 2005-05-11 15:43:56 -07:00
45 +++ b/MAINTAINERS 2005-05-11 15:43:56 -07:00
46 @@ -1966,6 +1966,11 @@
47 W: http://www.weinigel.se
48 S: Supported
49
50 +SECURITY CONTACT
51 +P: Security Officers
52 +M: security@kernel.org
53 +S: Supported
54 +
55 SELINUX SECURITY MODULE
56 P: Stephen Smalley
57 M: sds@epoch.ncsc.mil
58 diff -Nru a/Makefile b/Makefile
59 --- a/Makefile 2005-05-11 15:43:56 -07:00
60 +++ b/Makefile 2005-05-11 15:43:56 -07:00
61 @@ -1,7 +1,7 @@
62 VERSION = 2
63 PATCHLEVEL = 6
64 SUBLEVEL = 11
65 -EXTRAVERSION = .8
66 +EXTRAVERSION = .9
67 NAME=Woozy Beaver
68
69 # *DOCUMENTATION*
70 diff -Nru a/REPORTING-BUGS b/REPORTING-BUGS
71 --- a/REPORTING-BUGS 2005-05-11 15:43:56 -07:00
72 +++ b/REPORTING-BUGS 2005-05-11 15:43:56 -07:00
73 @@ -16,6 +16,10 @@
74 describe how to recreate it. That is worth even more than the oops itself.
75 The list of maintainers is in the MAINTAINERS file in this directory.
76
77 + If it is a security bug, please copy the Security Contact listed
78 +in the MAINTAINERS file. They can help coordinate bugfix and disclosure.
79 +See Documentation/SecurityBugs for more infomation.
80 +
81 If you are totally stumped as to whom to send the report, send it to
82 linux-kernel@vger.kernel.org. (For more information on the linux-kernel
83 mailing list see http://www.tux.org/lkml/).
84 diff -Nru a/fs/binfmt_elf.c b/fs/binfmt_elf.c
85 --- a/fs/binfmt_elf.c 2005-05-11 15:43:56 -07:00
86 +++ b/fs/binfmt_elf.c 2005-05-11 15:43:56 -07:00
87 @@ -257,7 +257,7 @@
88 }
89
90 /* Populate argv and envp */
91 - p = current->mm->arg_start;
92 + p = current->mm->arg_end = current->mm->arg_start;
93 while (argc-- > 0) {
94 size_t len;
95 __put_user((elf_addr_t)p, argv++);
96 @@ -1279,7 +1279,7 @@
97 static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
98 struct mm_struct *mm)
99 {
100 - int i, len;
101 + unsigned int i, len;
102
103 /* first copy the parameters from user space */
104 memset(psinfo, 0, sizeof(struct elf_prpsinfo));
105 diff -Nru a/fs/partitions/msdos.c b/fs/partitions/msdos.c
106 --- a/fs/partitions/msdos.c 2005-05-11 15:43:56 -07:00
107 +++ b/fs/partitions/msdos.c 2005-05-11 15:43:56 -07:00
108 @@ -114,9 +114,6 @@
109 */
110 for (i=0; i<4; i++, p++) {
111 u32 offs, size, next;
112 -
113 - if (SYS_IND(p) == 0)
114 - continue;
115 if (!NR_SECTS(p) || is_extended_partition(p))
116 continue;
117
118 @@ -433,8 +430,6 @@
119 for (slot = 1 ; slot <= 4 ; slot++, p++) {
120 u32 start = START_SECT(p)*sector_size;
121 u32 size = NR_SECTS(p)*sector_size;
122 - if (SYS_IND(p) == 0)
123 - continue;
124 if (!size)
125 continue;
126 if (is_extended_partition(p)) {
127 diff -Nru a/kernel/exit.c b/kernel/exit.c
128 --- a/kernel/exit.c 2005-05-11 15:43:56 -07:00
129 +++ b/kernel/exit.c 2005-05-11 15:43:56 -07:00
130 @@ -516,8 +516,6 @@
131 */
132 BUG_ON(p == reaper || reaper->exit_state >= EXIT_ZOMBIE);
133 p->real_parent = reaper;
134 - if (p->parent == p->real_parent)
135 - BUG();
136 }
137
138 static inline void reparent_thread(task_t *p, task_t *father, int traced)

  ViewVC Help
Powered by ViewVC 1.1.20