CVSROOT: /cvs/dm Module name: device-mapper Changes by: agk@xxxxxxxxxxxxxx 2007-04-27 16:12:26 Modified files: . : WHATS_NEW dmsetup : dmsetup.c Log message: Fix segfault in 'dmsetup status' without --showkeys against crypt target. [nec] Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/WHATS_NEW.diff?cvsroot=dm&r1=1.177&r2=1.178 http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.88&r2=1.89 --- device-mapper/WHATS_NEW 2007/04/27 14:52:40 1.177 +++ device-mapper/WHATS_NEW 2007/04/27 15:12:26 1.178 @@ -1,5 +1,6 @@ Version 1.02.19 - ==================================== + Fix segfault in 'dmsetup status' without --showkeys against crypt target. Deal with some more compiler warnings. Introduce _add_field() and _is_same_field() to libdm-report.c. Fix some libdevmapper-event and dmeventd memory leaks. --- device-mapper/dmsetup/dmsetup.c 2007/04/27 14:52:40 1.88 +++ device-mapper/dmsetup/dmsetup.c 2007/04/27 15:12:26 1.89 @@ -962,17 +962,18 @@ if (data && !_switches[VERBOSE_ARG]) printf("%s: ", name); if (target_type) { - - /* Suppress encryption key */ - if (!_switches[SHOWKEYS_ARG] && - !strcmp(target_type, "crypt")) { - c = params; - while (*c && *c != ' ') - c++; - c++; - while (*c && *c != ' ') - *c++ = '0'; - } + /* Suppress encryption key */ + if (!_switches[SHOWKEYS_ARG] && + cmd == DM_DEVICE_TABLE && + !strcmp(target_type, "crypt")) { + c = params; + while (*c && *c != ' ') + c++; + if (*c) + c++; + while (*c && *c != ' ') + *c++ = '0'; + } printf("%" PRIu64 " %" PRIu64 " %s %s", start, length, target_type, params); } -- dm-devel mailing list dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel
