From: mbroz@sourceware.org <mbroz@sourceware.org>
To: lvm-devel@redhat.com
Subject: LVM2 ./WHATS_NEW_DM libdm/ioctl/libdm-iface.c
Date: 13 May 2010 13:31:31 -0000 [thread overview]
Message-ID: <20100513133131.19610.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mbroz at sourceware.org 2010-05-13 13:31:30
Modified files:
. : WHATS_NEW_DM
libdm/ioctl : libdm-iface.c
Log message:
Do not print encryption key in message debug output.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.367&r2=1.368
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/ioctl/libdm-iface.c.diff?cvsroot=lvm2&r1=1.73&r2=1.74
--- LVM2/WHATS_NEW_DM 2010/04/30 15:48:39 1.367
+++ LVM2/WHATS_NEW_DM 2010/05/13 13:31:30 1.368
@@ -1,5 +1,6 @@
Version 1.02.48 -
=================================
+ Do not print encryption key in message debug output (cryptsetup luksResume).
Version 1.02.47 - 30th April 2010
=================================
--- LVM2/libdm/ioctl/libdm-iface.c 2010/05/03 22:08:38 1.73
+++ LVM2/libdm/ioctl/libdm-iface.c 2010/05/13 13:31:30 1.74
@@ -1102,7 +1102,7 @@
int dm_task_set_message(struct dm_task *dmt, const char *message)
{
if (!(dmt->message = dm_strdup(message))) {
- log_error("dm_task_set_message: strdup(%s) failed", message);
+ log_error("dm_task_set_message: strdup failed");
return 0;
}
@@ -1724,6 +1724,18 @@
return r;
}
+static const char *_sanitise_message(char *message)
+{
+ const char *sanitised_message = message ?: "";
+
+ /* FIXME: Check for whitespace variations. */
+ /* This traps what cryptsetup sends us. */
+ if (message && !strncasecmp(message, "key set", 7))
+ sanitised_message = "key set";
+
+ return sanitised_message;
+}
+
static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
unsigned repeat_count)
{
@@ -1805,7 +1817,7 @@
dmt->no_flush ? 'N' : 'F',
dmt->skip_lockfs ? "S " : "",
dmt->query_inactive_table ? "I " : "",
- dmt->sector, dmt->message ? dmt->message : "",
+ dmt->sector, _sanitise_message(dmt->message),
dmi->data_size);
#ifdef DM_IOCTLS
if (ioctl(_control_fd, command, dmi) < 0) {
next reply other threads:[~2010-05-13 13:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 13:31 mbroz [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-08-18 13:11 LVM2 ./WHATS_NEW_DM libdm/ioctl/libdm-iface.c prajnoha
2011-02-21 16:26 snitzer
2011-03-01 23:27 agk
2011-03-08 22:43 zkabelac
2011-03-25 23:50 agk
2011-06-09 15:07 mbroz
2011-07-02 1:17 agk
2011-07-24 23:59 agk
2011-08-11 20:49 zkabelac
2011-09-13 15:13 prajnoha
2011-09-16 12:07 ` Alasdair G Kergon
2011-09-17 19:34 ` Mikulas Patocka
2011-10-20 10:38 zkabelac
2011-11-08 17:32 snitzer
2012-02-08 11:25 zkabelac
2012-02-08 12:59 zkabelac
2012-02-15 12:17 prajnoha
2012-03-01 10:07 zkabelac
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100513133131.19610.qmail@sourceware.org \
--to=mbroz@sourceware.org \
--cc=lvm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.