* [gentoo-hardened] hardened-sources-2.6.36-r8
@ 2011-01-13 19:38 "Tóth Attila"
2011-01-13 19:23 ` pageexec
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: "Tóth Attila" @ 2011-01-13 19:38 UTC (permalink / raw
To: gentoo-hardened
Compiling the recent hardened-sources results in the following error
message, when irda is enabled:
CC net/irda/af_irda.o
net/irda/af_irda.c: In function ‘__irda_getsockopt’:
net/irda/af_irda.c:2289:4: error: label ‘out’ used but not defined
The changes causing it introduced recently.
--- linux-2.6.36-hardened-r7/net/irda/af_irda.c 2010-10-20
22:30:22.000000000 +0200
+++ linux-2.6.36-hardened-r8/net/irda/af_irda.c 2011-01-13
13:08:57.000000000 +0100
@@ -2278,6 +2278,17 @@
switch (optname) {
case IRLMP_ENUMDEVICES:
+
+
+ /* Offset to first device entry */
+ offset = sizeof(struct irda_device_list) -
+ sizeof(struct irda_device_info);
+
+ if (len < offset) {
+ err = -EINVAL;
+ goto out;
+ }
+
/* Ask lmp for the current discovery log */
discoveries = irlmp_get_discoveries(&list.len,
self->mask.word,
self->nslots);
@@ -2287,15 +2298,9 @@
err = 0;
/* Write total list length back to client */
- if (copy_to_user(optval, &list,
- sizeof(struct irda_device_list) -
- sizeof(struct irda_device_info)))
+ if (copy_to_user(optval, &list, offset))
err = -EFAULT;
- /* Offset to first device entry */
- offset = sizeof(struct irda_device_list) -
- sizeof(struct irda_device_info);
-
/* Copy the list itself - watch for overflow */
if(list.len > 2048)
{
What are your suggestions?
Thx:
Dw.
--
dr Tóth Attila, Radiológus, 06-20-825-8057
Attila Toth MD, Radiologist, +36-20-825-8057
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [gentoo-hardened] hardened-sources-2.6.36-r8
2011-01-13 19:38 [gentoo-hardened] hardened-sources-2.6.36-r8 "Tóth Attila"
@ 2011-01-13 19:23 ` pageexec
2011-01-13 20:05 ` "Tóth Attila"
2011-01-13 20:10 ` Matthew Thode
2 siblings, 0 replies; 5+ messages in thread
From: pageexec @ 2011-01-13 19:23 UTC (permalink / raw
To: gentoo-hardened
On 13 Jan 2011 at 20:38, "Tóth Attila" wrote:
> Compiling the recent hardened-sources results in the following error
> message, when irda is enabled:
>
> CC net/irda/af_irda.o
> net/irda/af_irda.c: In function `__irda_getsockopt´:
> net/irda/af_irda.c:2289:4: error: label `out´ used but not defined
this should already be fixed in the latest grsec patch.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [gentoo-hardened] hardened-sources-2.6.36-r8
2011-01-13 19:38 [gentoo-hardened] hardened-sources-2.6.36-r8 "Tóth Attila"
2011-01-13 19:23 ` pageexec
@ 2011-01-13 20:05 ` "Tóth Attila"
2011-01-13 20:10 ` Matthew Thode
2 siblings, 0 replies; 5+ messages in thread
From: "Tóth Attila" @ 2011-01-13 20:05 UTC (permalink / raw
To: gentoo-hardened
What about this one?
--- af_irda.c 2011-01-13 20:41:26.000000000 +0100
+++ af_irda-dwokfur.c 2011-01-13 20:41:50.000000000 +0100
@@ -2286,7 +2286,7 @@
if (len < offset) {
err = -EINVAL;
- goto out;
+ goto bed;
}
/* Ask lmp for the current discovery log */
It still complains:
net/irda/af_irda.c: In function ‘irda_getsockopt’:
net/irda/af_irda.c:2258:27: warning: ‘discoveries’ may be used
uninitialized in this function
net/irda/af_irda.c:2258:27: note: ‘discoveries’ was declared here
Regards:
Dw.
--
dr Tóth Attila, Radiológus, 06-20-825-8057
Attila Toth MD, Radiologist, +36-20-825-8057
2011.Január 13.(Cs) 20:38 időpontban "Tóth Attila" ezt írta:
> Compiling the recent hardened-sources results in the following error
> message, when irda is enabled:
>
> CC net/irda/af_irda.o
> net/irda/af_irda.c: In function ‘__irda_getsockopt’:
> net/irda/af_irda.c:2289:4: error: label ‘out’ used but not defined
>
> The changes causing it introduced recently.
>
> --- linux-2.6.36-hardened-r7/net/irda/af_irda.c 2010-10-20
> 22:30:22.000000000 +0200
> +++ linux-2.6.36-hardened-r8/net/irda/af_irda.c 2011-01-13
> 13:08:57.000000000 +0100
> @@ -2278,6 +2278,17 @@
>
> switch (optname) {
> case IRLMP_ENUMDEVICES:
> +
> +
> + /* Offset to first device entry */
> + offset = sizeof(struct irda_device_list) -
> + sizeof(struct irda_device_info);
> +
> + if (len < offset) {
> + err = -EINVAL;
> + goto out;
> + }
> +
> /* Ask lmp for the current discovery log */
> discoveries = irlmp_get_discoveries(&list.len,
> self->mask.word,
> self->nslots);
> @@ -2287,15 +2298,9 @@
> err = 0;
>
> /* Write total list length back to client */
> - if (copy_to_user(optval, &list,
> - sizeof(struct irda_device_list) -
> - sizeof(struct irda_device_info)))
> + if (copy_to_user(optval, &list, offset))
> err = -EFAULT;
>
> - /* Offset to first device entry */
> - offset = sizeof(struct irda_device_list) -
> - sizeof(struct irda_device_info);
> -
> /* Copy the list itself - watch for overflow */
> if(list.len > 2048)
> {
>
> What are your suggestions?
>
> Thx:
> Dw.
> --
> dr Tóth Attila, Radiológus, 06-20-825-8057
> Attila Toth MD, Radiologist, +36-20-825-8057
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [gentoo-hardened] hardened-sources-2.6.36-r8
2011-01-13 19:38 [gentoo-hardened] hardened-sources-2.6.36-r8 "Tóth Attila"
2011-01-13 19:23 ` pageexec
2011-01-13 20:05 ` "Tóth Attila"
@ 2011-01-13 20:10 ` Matthew Thode
2011-01-13 20:14 ` Matthew Thode
2 siblings, 1 reply; 5+ messages in thread
From: Matthew Thode @ 2011-01-13 20:10 UTC (permalink / raw
To: gentoo-hardened
[-- Attachment #1: Type: text/plain, Size: 2208 bytes --]
I had this issue with vanilla 2.6.32.27 patched with the 2.6.32.27 grsec
patch (2-3 days ago).
On Thu, Jan 13, 2011 at 14:38, "Tóth Attila" <atoth@atoth.sote.hu> wrote:
> Compiling the recent hardened-sources results in the following error
> message, when irda is enabled:
>
> CC net/irda/af_irda.o
> net/irda/af_irda.c: In function ‘__irda_getsockopt’:
> net/irda/af_irda.c:2289:4: error: label ‘out’ used but not defined
>
> The changes causing it introduced recently.
>
> --- linux-2.6.36-hardened-r7/net/irda/af_irda.c 2010-10-20
> 22:30:22.000000000 +0200
> +++ linux-2.6.36-hardened-r8/net/irda/af_irda.c 2011-01-13
> 13:08:57.000000000 +0100
> @@ -2278,6 +2278,17 @@
>
> switch (optname) {
> case IRLMP_ENUMDEVICES:
> +
> +
> + /* Offset to first device entry */
> + offset = sizeof(struct irda_device_list) -
> + sizeof(struct irda_device_info);
> +
> + if (len < offset) {
> + err = -EINVAL;
> + goto out;
> + }
> +
> /* Ask lmp for the current discovery log */
> discoveries = irlmp_get_discoveries(&list.len,
> self->mask.word,
> self->nslots);
> @@ -2287,15 +2298,9 @@
> err = 0;
>
> /* Write total list length back to client */
> - if (copy_to_user(optval, &list,
> - sizeof(struct irda_device_list) -
> - sizeof(struct irda_device_info)))
> + if (copy_to_user(optval, &list, offset))
> err = -EFAULT;
>
> - /* Offset to first device entry */
> - offset = sizeof(struct irda_device_list) -
> - sizeof(struct irda_device_info);
> -
> /* Copy the list itself - watch for overflow */
> if(list.len > 2048)
> {
>
> What are your suggestions?
>
> Thx:
> Dw.
> --
> dr Tóth Attila, Radiológus, 06-20-825-8057
> Attila Toth MD, Radiologist, +36-20-825-8057
>
>
>
[-- Attachment #2: Type: text/html, Size: 2876 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [gentoo-hardened] hardened-sources-2.6.36-r8
2011-01-13 20:10 ` Matthew Thode
@ 2011-01-13 20:14 ` Matthew Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Thode @ 2011-01-13 20:14 UTC (permalink / raw
To: gentoo-hardened
[-- Attachment #1: Type: text/plain, Size: 2407 bytes --]
Spender said he just fixed that VERY recently.
On Thu, Jan 13, 2011 at 15:10, Matthew Thode <mthode@mthode.org> wrote:
> I had this issue with vanilla 2.6.32.27 patched with the 2.6.32.27 grsec
> patch (2-3 days ago).
>
>
> On Thu, Jan 13, 2011 at 14:38, "Tóth Attila" <atoth@atoth.sote.hu> wrote:
>
>> Compiling the recent hardened-sources results in the following error
>> message, when irda is enabled:
>>
>> CC net/irda/af_irda.o
>> net/irda/af_irda.c: In function ‘__irda_getsockopt’:
>> net/irda/af_irda.c:2289:4: error: label ‘out’ used but not defined
>>
>> The changes causing it introduced recently.
>>
>> --- linux-2.6.36-hardened-r7/net/irda/af_irda.c 2010-10-20
>> 22:30:22.000000000 +0200
>> +++ linux-2.6.36-hardened-r8/net/irda/af_irda.c 2011-01-13
>> 13:08:57.000000000 +0100
>> @@ -2278,6 +2278,17 @@
>>
>> switch (optname) {
>> case IRLMP_ENUMDEVICES:
>> +
>> +
>> + /* Offset to first device entry */
>> + offset = sizeof(struct irda_device_list) -
>> + sizeof(struct irda_device_info);
>> +
>> + if (len < offset) {
>> + err = -EINVAL;
>> + goto out;
>> + }
>> +
>> /* Ask lmp for the current discovery log */
>> discoveries = irlmp_get_discoveries(&list.len,
>> self->mask.word,
>> self->nslots);
>> @@ -2287,15 +2298,9 @@
>> err = 0;
>>
>> /* Write total list length back to client */
>> - if (copy_to_user(optval, &list,
>> - sizeof(struct irda_device_list) -
>> - sizeof(struct irda_device_info)))
>> + if (copy_to_user(optval, &list, offset))
>> err = -EFAULT;
>>
>> - /* Offset to first device entry */
>> - offset = sizeof(struct irda_device_list) -
>> - sizeof(struct irda_device_info);
>> -
>> /* Copy the list itself - watch for overflow */
>> if(list.len > 2048)
>> {
>>
>> What are your suggestions?
>>
>> Thx:
>> Dw.
>> --
>> dr Tóth Attila, Radiológus, 06-20-825-8057
>> Attila Toth MD, Radiologist, +36-20-825-8057
>>
>>
>>
>
[-- Attachment #2: Type: text/html, Size: 3291 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-13 21:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-13 19:38 [gentoo-hardened] hardened-sources-2.6.36-r8 "Tóth Attila"
2011-01-13 19:23 ` pageexec
2011-01-13 20:05 ` "Tóth Attila"
2011-01-13 20:10 ` Matthew Thode
2011-01-13 20:14 ` Matthew Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox