vsprintf: increase sizeof precision in printf_spec
Subsystems (2)
PATCH 1/1 vsprintf: increase sizeof precision in printf_spec
Patch ef0658f3de484bf9b173639cd47544584e01efa5 changed the precision field from and int to an s8. Problem is that we have code which uses a much larger precision in the kernel. An example would in the audit code where we have:
vsnprintf(...,..., " msg='%.1024s'", (char *)data);
which causes precision to be too large and end up truncating to nothing. Raising the size of the precision fixes the audit system issue. It also does not affect the alignment of the struct according to pahole and is still approprietely packed.
---
lib/vsprintf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
lib/vsprintf.c +1 -1
@@ -412,7 +412,7 @@ struct printf_spec {s16 field_width;/* width of output field */ u8 flags;/* flags to number() */ u8 base; -s8 precision;/* # of digits/chars */ +s16 precision;/* # of digits/chars */ u8 qualifier; };
Quoted 10 lines · Eric Paris
Patch
ef0658f3de484bf9b173639cd47544584e01efa5changed the precision field from and int to an s8. Problem is that we have code which uses a much larger precision in the kernel. An example would in the audit code where we have:
vsnprintf(...,..., " msg='%.1024s'", (char *)data);which causes precision to be too large and end up truncating to nothing. Raising the size of the precision fixes the audit system issue. It also does not affect the alignment of the struct according to pahole and is still approprietely packed.
I don't see how it could be appropriately packed.
This is the structure now:
struct printf_spec {
u16 type;
s16 field_width; /* width of output field */
u8 flags; /* flags to number() */
u8 base;
s8 precision; /* # of digits/chars */
u8 qualifier;
};Adding another char should make the structure larger than 64 bits.
type isn't currently required to be u16.
It could be u8.
Perhaps this is better.
struct printf_spec {
u8 type;
u8 flags; /* flags to number() */
u8 base;
u8 qualifier;
s16 field_width; /* width of output field */
s16 precision; /* # of digits/chars */
} __attribute__((packed));Quoted 5 lines · Joe Perches
Quoted 4 lines · Eric Paris
Patch
ef0658f3de484bf9b173639cd47544584e01efa5changed the precision field from and int to an s8. Problem is that we have code which uses a much larger precision in the kernel. An example would in the audit code where we have:
Quoted 8 lines
Quoted 6 lines
vsnprintf(...,..., " msg='%.1024s'", (char *)data);which causes precision to be too large and end up truncating to nothing. Raising the size of the precision fixes the audit system issue. It also does not affect the alignment of the struct according to pahole and is still approprietely packed.
I don't see how it could be appropriately packed.
I was just saying there was no padding inside the struct, although you are right about it now being longer than 64.
Quoted 5 lines
type isn't currently required to be u16.
It could be u8.Perhaps this is better.
Quoted 8 lines
struct printf_spec {
u8 type;
u8 flags; /* flags to number() */
u8 base;
u8 qualifier;
s16 field_width; /* width of output field */
s16 precision; /* # of digits/chars */
} __attribute__((packed));If we don't need the size in type I'm happy with this.
But what does __attribute__((packed)) buy us? I always thought that was frowned upon because it could put us in a position where if it does affect the layout it destroys performance on systems where unaligned access matters. I don't think it is going to affect the alignment of this struct, so I don't understand why we should add it. But maybe I'm misinformed....
I'll gladly resend with u8 type and s16 precision if that's the best solution.
-Eric
Quoted 13 lines · Eric Paris
Quoted 12 lines · Joe Perches
Quoted 10 lines · Eric Paris
Patch
ef0658f3de484bf9b173639cd47544584e01efa5changed the precision field from and int to an s8. Problem is that we have code which uses a much larger precision in the kernel. An example would in the audit code where we have:
vsnprintf(...,..., " msg='%.1024s'", (char *)data);which causes precision to be too large and end up truncating to nothing. Raising the size of the precision fixes the audit system issue. It also does not affect the alignment of the struct according to pahole and is still approprietely packed.
Quoted 4 lines
Quoted 1 line
I don't see how it could be appropriately packed.
I was just saying there was no padding inside the struct, although you are right about it now being longer than 64.
Which is bad.
Quoted 1 line
But what does __attribute__((packed)) buy us?
It could force the size to be 64 bits on more platforms.
Quoted 2 lines
I'll gladly resend with u8 type and s16 precision if that's the best solution.
Reordering struct members to keep width and precision together seems appropriate. The attribute may not be.
struct printf_spec {
u8 type;
u8 flags; /* flags to number() */
u8 base;
u8 qualifier;
s16 field_width; /* width of output field */
s16 precision; /* # of digits/chars */
};Quoted 41 lines · Joe Perches
Quoted 13 lines · Eric Paris
Quoted 12 lines · Joe Perches
Quoted 10 lines · Eric Paris
Patch
ef0658f3de484bf9b173639cd47544584e01efa5changed the precision field from and int to an s8. Problem is that we have code which uses a much larger precision in the kernel. An example would in the audit code where we have:
vsnprintf(...,..., " msg='%.1024s'", (char *)data);which causes precision to be too large and end up truncating to nothing. Raising the size of the precision fixes the audit system issue. It also does not affect the alignment of the struct according to pahole and is still approprietely packed.
Quoted 4 lines
Quoted 1 line
I don't see how it could be appropriately packed.
I was just saying there was no padding inside the struct, although you are right about it now being longer than 64.
Which is bad.
Quoted 1 line
But what does __attribute__((packed)) buy us?
It could force the size to be 64 bits on more platforms.
Quoted 2 lines
I'll gladly resend with u8 type and s16 precision if that's the best solution.
Reordering struct members to keep width and precision together seems appropriate. The attribute may not be.
struct printf_spec { u8 type; u8 flags; /* flags to number() */ u8 base; u8 qualifier; s16 field_width; /* width of output field */ s16 precision; /* # of digits/chars */ };
Quoted 6 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
o.k. just added this patch from the first post, and the avc's look complete.(I'll keep an eye on nscd to make sure those avc's are complete as well).
looks good over here.
Justin P. Mattock
Quoted 31 lines · Joe Perches
Quoted 13 lines · Eric Paris
Quoted 12 lines · Joe Perches
Quoted 10 lines · Eric Paris
Patch
ef0658f3de484bf9b173639cd47544584e01efa5changed the precision field from and int to an s8. Problem is that we have code which uses a much larger precision in the kernel. An example would in the audit code where we have:
vsnprintf(...,..., " msg='%.1024s'", (char *)data);which causes precision to be too large and end up truncating to nothing. Raising the size of the precision fixes the audit system issue. It also does not affect the alignment of the struct according to pahole and is still approprietely packed.
Quoted 4 lines
Quoted 1 line
I don't see how it could be appropriately packed.
I was just saying there was no padding inside the struct, although you are right about it now being longer than 64.
Which is bad.
Quoted 1 line
But what does __attribute__((packed)) buy us?
It could force the size to be 64 bits on more platforms.
Quoted 2 lines
I'll gladly resend with u8 type and s16 precision if that's the best solution.
Reordering struct members to keep width and precision together seems appropriate. The attribute may not be.
Quoted 8 lines
struct printf_spec {
u8 type;
u8 flags; /* flags to number() */
u8 base;
u8 qualifier;
s16 field_width; /* width of output field */
s16 precision; /* # of digits/chars */
};Yeah, we should avoid the attribute. Packing struct should be done for pretty special cases, not to fix padding holes, because the hole problem would be turned into an alignment access unefficiency.
PATCH v2 1/1 vsprintf: Change struct printf_spec.precision from s8 to s16
In reply to Eric ParisCommit ef0658f3de484bf9b173639cd47544584e01efa5 changed precision from int to s8.
There is existing kernel code that uses a larger precision.
An example from the audit code:
vsnprintf(...,..., " msg='%.1024s'", (char *)data);
which overflows precision and truncates to nothing.
Extending precision size fixes the audit system issue.
Other changes:
Change the size of the struct printf_spec.type from u16 to u8 so sizeof(struct printf_spec) stays as small as possible. Reorder the struct members so sizeof(struct printf_spec) remains 64 bits without alignment holes.
Document the struct members a bit more.
--- lib/vsprintf.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
lib/vsprintf.c +5 -5
@@ -408,12 +408,12 @@ enum format_type { };struct printf_spec { -u16 type; -s16 field_width;/* width of output field */ +u8 type;/* format_type enum */ u8 flags;/* flags to number() */ -u8 base; -s8 precision;/* # of digits/chars */ -u8 qualifier; +u8 base;/* number base, 8, 10 or 16 only */ +u8 qualifier;/* number qualifier, one of 'hHlLtzZ' */ +s16 field_width;/* width of output field */ +s16 precision;/* # of digits/chars */ }; static char *number(char *buf, char *end, unsigned long long num,
Re: [REGRESSION PATCH V2] vsprintf: Change struct printf_spec.precision from s8 to s16
Quoted 50 lines · Joe Perches
Commit
ef0658f3de484bf9b173639cd47544584e01efa5changed precision from int to s8.There is existing kernel code that uses a larger precision.
An example from the audit code:
vsnprintf(...,..., " msg='%.1024s'", (char *)data);which overflows precision and truncates to nothing.
Extending precision size fixes the audit system issue.
Other changes:
Change the size of the struct printf_spec.type from u16 to u8 so
sizeof(struct printf_spec)stays as small as possible. Reorder the struct members sosizeof(struct printf_spec)remains 64 bits without alignment holes.
Document the struct members a bit more.Original-patch-by Eric Paris<[email protected]>Signed-off-by Joe Perches<[email protected]>--- lib/vsprintf.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)lib/vsprintf.c +5
-6@@ -408,12 +408,12 @@ enum format_type { };struct printf_spec { -u16 type; -s16 field_width;/* width of output field */ +u8 type;/* format_type enum */ u8 flags;/* flags to number() */ -u8 base; -s8 precision;/* # of digits/chars */ -u8 qualifier; +u8 base;/* number base, 8, 10 or 16 only */ +u8 qualifier;/* number qualifier, one of 'hHlLtzZ' */ +s16 field_width;/* width of output field */ +s16 precision;/* # of digits/chars */ }; static char *number(char *buf, char *end, unsigned long long num, --
Quoted 5 lines
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
just applied:
the first patch in this thread is good,
as well as this one.
Justin P. Mattock
Re: [REGRESSION PATCH V2] vsprintf: Change struct printf_spec.precision from s8 to s16
In reply to Joe PerchesQuoted 13 lines · Joe Perches
Commit
ef0658f3de484bf9b173639cd47544584e01efa5changed precision from int to s8.There is existing kernel code that uses a larger precision.
An example from the audit code:
vsnprintf(...,..., " msg='%.1024s'", (char *)data);which overflows precision and truncates to nothing.
Extending precision size fixes the audit system issue.
Other changes:
Quoted 8 lines
Change the size of the struct printf_spec.type from u16 to u8 so
sizeof(struct printf_spec)stays as small as possible. Reorder the struct members sosizeof(struct printf_spec)remains 64 bits without alignment holes.
Document the struct members a bit more.Original-patch-by Eric Paris <[email protected]>Signed-off-by Joe Perches <[email protected]>
Sorry slow today
Tested-by:
Review-by:
anything else?