On Tue, Dec 04, 2012 at 04:22:02PM +0100, Bernhard Voelker wrote:
> On 11/30/2012 05:14 PM, Bernhard Voelker wrote:
> > From 4ddf21607847570e1da3b692276f2a8242bd5af6 Mon Sep 17 00:00:00 2001
> > From: Bernhard Voelker <mail@xxxxxxxxxxxxxxxxxxx>
> > Date: Fri, 30 Nov 2012 17:12:12 +0100
> > Subject: [PATCH] libmount: avoid endless loop in
> > mnt_get_kernel_cmdline_option
>
> Hi Karel,
>
> BTW: the #ifdef in mnt_get_kernel_cmdline_option doesn't seem
> to work to make use of the LIBMOUNT_KERNEL_CMDLINE env var:
>
> --- tests/expected/libmount/utils-kernel-cmdline 2012-11-22 10:41:18.424077009 +0100
> +++ tests/output/libmount/utils-kernel-cmdline 2012-12-04 16:17:49.629199061 +0100
> @@ -1,5 +1,5 @@
> -'selinux=' found, argument: '0'
> +'selinux=' not found
> 'selinux' not found
> -'ro' found
> +'ro' not found
> 'ro=' not found
> -'root=' found, argument: 'UUID=33230ae2-1093-4353-824c-f7ca09a2a882'
> +'root=' found, argument: '/dev/sda1'
>
> And ltraced:
>
> $ export LIBMOUNT_KERNEL_CMDLINE=`pwd`/tests/ts/libmount/files/kernel_cmdline
> $ ltrace -e getenv,fopen -f ./test_mount_utils --kernel-cmdline selinux=
> getenv("LIBMOUNT_DEBUG") = NULL
> fopen("/proc/cmdline", "r") = 0x609010
> 'selinux=' not found
> +++ exited (status 0) +++
It works, the problem is safe_getenv(), it requires root
permissions.
I had the test originally without the #ifdef TEST_PROGRAM, so the
safe_getenv() was good idea, now it's overkill. Fixed, thanks!
$ LIBMOUNT_KERNEL_CMDLINE=tests/ts/libmount/files/kernel_cmdline \
ltrace -e fopen,getenv ./test_mount_utils --kernel-cmdline selinux=
getenv("LIBMOUNT_DEBUG") = NULL
getenv("LIBMOUNT_KERNEL_CMDLINE") = "tests/ts/libmount/files/kernel_c"...
fopen("tests/ts/libmount/files/kernel_c"..., "r") = 0x1c99010
> I.e. the utils test may only work on your PC. ;-)
:-)
> BTW2: the libmount tests all fail when the user has set
> LIBMOUNT_DEBUG=0xffff, because the produced output differs.
> Maybe LIBMOUNT_DEBUG should be unset in tests/run.sh?
Good idea. Implemented.
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
