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/lib/mm memlock.c Date: Tue, 09 Mar 2010 10:25:00 -0000 [thread overview] Message-ID: <20100309102551.1173.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2010-03-09 10:25:50 Modified files: lib/mm : memlock.c Log message: Update comments for selecting maps Use dm_snprintf and check result whether we create correct /proc path name Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mm/memlock.c.diff?cvsroot=lvm2&r1=1.20&r2=1.21 --- LVM2/lib/mm/memlock.c 2010/03/09 03:16:11 1.20 +++ LVM2/lib/mm/memlock.c 2010/03/09 10:25:50 1.21 @@ -78,7 +78,7 @@ static unsigned _use_mlockall; static FILE *_mapsh; static char _procselfmaps[PATH_MAX] = ""; -static const char _selfmaps[] = "/self/maps"; +#define SELF_MAPS "/self/maps" struct maps_stats { size_t r_size; @@ -140,7 +140,7 @@ return 0; } - /* skip ---p, select with r,w,x */ + /* Select readable maps */ if (fr != 'r') return 1; @@ -244,13 +244,14 @@ _use_mlockall = find_config_tree_bool(cmd, "activation/use_mlockall", DEFAULT_USE_MLOCKALL); if (!_use_mlockall) { - /* Initialise static variables first time */ + /* Reset statistic counters */ memset(&_mstats, 0, sizeof(_mstats)); - if (!*_procselfmaps) { - _procselfmaps[PATH_MAX - 1] = '\0'; - strncpy(_procselfmaps, cmd->proc_dir, PATH_MAX - 1); - strncat(_procselfmaps, _selfmaps, PATH_MAX - 1); + if (!*_procselfmaps && + dm_snprintf(_procselfmaps, sizeof(_procselfmaps), + "%s" SELF_MAPS, cmd->proc_dir) < 0) { + log_error("proc_dir too long"); + return; } if (!(_mapsh = fopen(_procselfmaps, "r"))) {
next reply other threads:[~2010-03-09 10:25 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-03-09 10:25 zkabelac [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-03-01 21:19 zkabelac 2012-02-01 10:48 zkabelac 2011-06-01 19:26 agk 2011-03-06 17:52 zkabelac 2011-02-18 14:51 zkabelac 2010-10-25 13:00 zkabelac 2010-10-15 9:48 zkabelac 2010-07-08 14:47 zkabelac 2010-07-08 13:05 zkabelac 2010-04-01 14:53 zkabelac 2010-04-01 13:43 zkabelac 2010-03-30 14:41 zkabelac 2010-03-30 14:41 zkabelac 2010-03-09 12:31 agk 2010-03-08 17:14 zkabelac 2010-03-08 15:55 zkabelac 2010-03-05 15:14 zkabelac 2009-11-18 18:22 mornfall 2008-05-28 23:12 agk
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=20100309102551.1173.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: linkBe 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).