shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdm: hardening transaction_id validation

Browse Source 
Improve testing of transation_id to not allow other difference
then either kernel TID is equal or is lower by oned and there
are queued messages for transaction.

Mark messages as submitted if the transaction_id is already matching.

Do not try to deactivate node on failure here and leave it on
proper error path of the caller.
This commit is contained in:
Zdenek Kabelac 2014-02-24 10:19:50 +01:00
parent 6116333ccc
commit c7b7cb60e4
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.85 - Version 1.02.85 -
=================================== ===================================
Transaction_id could be lower by one only when messages are prepared.
Do not call callback when preload fails. Do not call callback when preload fails.
Wrap is_selinux_enabled() to be called just once. Wrap is_selinux_enabled() to be called just once.
Use correctly signed 64b constant when working with raid volumes. Use correctly signed 64b constant when working with raid volumes.

35
libdm/libdm-deptree.c
View File

@ -1486,6 +1486,7 @@ static int _node_send_messages(struct dm_tree_node *dnode,
struct thin_message *tmsg; struct thin_message *tmsg;
uint64_t trans_id; uint64_t trans_id;
const char *uuid; const char *uuid;
int have_messages;
if (!dnode->info.exists || (dm_list_size(&dnode->props.segs) != 1)) if (!dnode->info.exists || (dm_list_size(&dnode->props.segs) != 1))
return 1; return 1;
@ -1503,32 +1504,31 @@ static int _node_send_messages(struct dm_tree_node *dnode,
} }
if (!_thin_pool_status_transaction_id(dnode, &trans_id)) if (!_thin_pool_status_transaction_id(dnode, &trans_id))
goto_bad; return_0;
have_messages = !dm_list_empty(&seg->thin_messages) ? 1 : 0;
if (trans_id == seg->transaction_id) { if (trans_id == seg->transaction_id) {
if (!dm_list_empty(&seg->thin_messages)) dnode->props.send_messages = 0; /* messages already committed */
if (have_messages)
log_debug_activation("Thin pool transaction_id matches %" PRIu64 log_debug_activation("Thin pool transaction_id matches %" PRIu64
", skipping messages.", trans_id); ", skipping messages.", trans_id);
return 1; /* In sync - skip messages */ return 1;
} }
if (trans_id != (seg->transaction_id - 1)) { /* Error if there are no stacked messages or id mismatches */
if (trans_id != (seg->transaction_id - have_messages)) {
log_error("Thin pool transaction_id=%" PRIu64 ", while expected: %" PRIu64 ".", log_error("Thin pool transaction_id=%" PRIu64 ", while expected: %" PRIu64 ".",
trans_id, seg->transaction_id - 1); trans_id, seg->transaction_id - have_messages);
goto bad; /* Nothing to send */ return 0;
} }
dm_list_iterate_items(tmsg, &seg->thin_messages) dm_list_iterate_items(tmsg, &seg->thin_messages)
if (!(_thin_pool_node_message(dnode, tmsg))) if (!(_thin_pool_node_message(dnode, tmsg)))
goto_bad; return_0;
dnode->props.send_messages = 0; /* messages posted */
return 1; return 1;
bad:
/* Try to deactivate */
if (!(dm_tree_deactivate_children(dnode, uuid_prefix, uuid_prefix_len)))
log_error("Failed to deactivate %s", dnode->name);
return 0;
} }
/* /*
@ -1864,12 +1864,9 @@ int dm_tree_activate_children(struct dm_tree_node *dnode,
* resume should continue further, just whole command * resume should continue further, just whole command
* has to report failure. * has to report failure.
*/ */
if (r && dnode->props.send_messages) { if (r && dnode->props.send_messages &&
if (!(r = _node_send_messages(dnode, uuid_prefix, uuid_prefix_len))) !(r = _node_send_messages(dnode, uuid_prefix, uuid_prefix_len)))
stack; stack;
else
dnode->props.send_messages = 0; /* messages posted */
}
return r; return r;
} }