-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Acked-by: Andrew G. Morgan <[EMAIL PROTECTED]>
Cheers
Andrew
Andrew Morton wrote:
| On Wed, 21 May 2008 22:01:17 -0700 "Andrew G. Morgan"
<[EMAIL PROTECTED]> wrote:
|
|> this is the default expected by the subsequent switch ().
|>
|> Signed-off-by: Andrew G. Morgan <[EMAIL PROTECTED]>
|> ---
|> kernel/sys.c | 2 ++
|> 1 files changed, 2 insertions(+), 0 deletions(-)
|>
|> diff --git a/kernel/sys.c b/kernel/sys.c
|> index 895d2d4..cb25a64 100644
|> --- a/kernel/sys.c
|> +++ b/kernel/sys.c
|> @@ -1657,6 +1657,8 @@ asmlinkage long sys_prctl(int option, unsigned
long arg2, unsigned long arg3,
|> if (security_task_prctl(option, arg2, arg3, arg4, arg5, &error))
|> return error;
|>
|> + error = 0;
|> +
|> switch (option) {
|> case PR_SET_PDEATHSIG:
|> if (!valid_signal(arg2)) {
|
| Looking at it some more there are two cases which don't initialise
| `error': PR_SET_PDEATHSIG and PR_SET_DUMPABLE. (let's set aside the
| silliness of having sys_prctl() perform set_dumpable()'s argument
| checking for it).
|
| So I would propose this fix, mainly because it removes that nasty
| uninitialized_var(). Please review carefully.
|
|
|
| From: Shi Weihua <[EMAIL PROTECTED]>
|
| If none of the switch cases match, the PR_SET_PDEATHSIG and
| PR_SET_DUMPABLE cases of the switch statement will never write to local
| variable `error'.
|
| Signed-off-by: Shi Weihua <[EMAIL PROTECTED]>
| Cc: Andrew G. Morgan <[EMAIL PROTECTED]>
| Cc: "Serge E. Hallyn" <[EMAIL PROTECTED]>
| Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
| ---
|
| kernel/sys.c | 6 ++----
| 1 file changed, 2 insertions(+), 4 deletions(-)
|
| diff -puN kernel/sys.c~sys_prctl-fix-return-of-uninitialized-value
kernel/sys.c
| --- a/kernel/sys.c~sys_prctl-fix-return-of-uninitialized-value
| +++ a/kernel/sys.c
| @@ -1652,7 +1652,7 @@ asmlinkage long sys_umask(int mask)
| asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned
long arg3,
| unsigned long arg4, unsigned long arg5)
| {
| - long uninitialized_var(error);
| + long error = 0;
|
| if (security_task_prctl(option, arg2, arg3, arg4, arg5, &error))
| return error;
| @@ -1701,9 +1701,7 @@ asmlinkage long sys_prctl(int option, un
| error = PR_TIMING_STATISTICAL;
| break;
| case PR_SET_TIMING:
| - if (arg2 == PR_TIMING_STATISTICAL)
| - error = 0;
| - else
| + if (arg2 != PR_TIMING_STATISTICAL)
| error = -EINVAL;
| break;
|
| _
|
| --
| To unsubscribe from this list: send the line "unsubscribe
linux-security-module" in
| the body of a message to [EMAIL PROTECTED]
| More majordomo info at http://vger.kernel.org/majordomo-info.html
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
iD8DBQFINXAX+bHCR3gb8jsRAl4JAJ0djex041bKhq2gvcwUdJpfjSt9+gCeI4g0
uh1GZlx9WxoeU4ztcOV2kHI=
=c1Dw
-----END PGP SIGNATURE-----
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
