public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2 ./WHATS_NEW lib/locking/file_locking.c
Date: Wed, 08 Feb 2012 11:17:00 -0000 [thread overview]
Message-ID: <20120208111735.31746.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2012-02-08 11:17:35
Modified files:
. : WHATS_NEW
lib/locking : file_locking.c
Log message:
Check that whole locking_dir fits _lock_dir buffer
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2264&r2=1.2265
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/locking/file_locking.c.diff?cvsroot=lvm2&r1=1.62&r2=1.63
--- LVM2/WHATS_NEW 2012/02/08 11:12:18 1.2264
+++ LVM2/WHATS_NEW 2012/02/08 11:17:34 1.2265
@@ -1,5 +1,6 @@
Version 2.02.91 -
===================================
+ Check that whole locking_dir fits _lock_dir buffer in init_file_locking().
Use list functions for label_exit().
Ensure strncpy() function always ends with '\0'.
Set status in _fsadm_cmd() for error path.
--- LVM2/lib/locking/file_locking.c 2012/01/20 00:27:20 1.62
+++ LVM2/lib/locking/file_locking.c 2012/02/08 11:17:35 1.63
@@ -337,6 +337,7 @@
int suppress_messages)
{
int r;
+ const char *locking_dir;
locking->lock_resource = _file_lock_resource;
locking->reset_locking = _reset_file_locking;
@@ -344,9 +345,14 @@
locking->flags = 0;
/* Get lockfile directory from config file */
- strncpy(_lock_dir, find_config_tree_str(cmd, "global/locking_dir",
- DEFAULT_LOCK_DIR),
- sizeof(_lock_dir));
+ locking_dir = find_config_tree_str(cmd, "global/locking_dir",
+ DEFAULT_LOCK_DIR);
+ if (strlen(locking_dir) >= sizeof(_lock_dir)) {
+ log_error("Path for locking_dir %s is invalid.", locking_dir);
+ return 0;
+ }
+
+ strcpy(_lock_dir, locking_dir);
_prioritise_write_locks =
find_config_tree_bool(cmd, "global/prioritise_write_locks",
next reply other threads:[~2012-02-08 11:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-08 11:17 zkabelac [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-08-13 13:23 mornfall
2007-07-20 12:12 meyering
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=20120208111735.31746.qmail@sourceware.org \
--to=zkabelac@sourceware.org \
--cc=lvm-devel@redhat.com \
--cc=lvm2-cvs@sourceware.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).