public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: snitzer@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW_DM libdm/ioctl/libdm-iface.c Date: Tue, 08 Nov 2011 17:32:00 -0000 [thread overview] Message-ID: <20111108173212.25065.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: snitzer@sourceware.org 2011-11-08 17:32:11 Modified files: . : WHATS_NEW_DM libdm/ioctl : libdm-iface.c Log message: Fix _get_proc_number to be tolerant of malformed /proc/misc entries. Fixes issue reported here: http://lkml.org/lkml/2011/11/8/190 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.520&r2=1.521 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/ioctl/libdm-iface.c.diff?cvsroot=lvm2&r1=1.126&r2=1.127 --- LVM2/WHATS_NEW_DM 2011/10/31 12:22:49 1.520 +++ LVM2/WHATS_NEW_DM 2011/11/08 17:32:10 1.521 @@ -1,5 +1,6 @@ Version 1.02.68 - ================================== + Fix _get_proc_number to be tolerant of malformed /proc/misc entries. Add ExecReload to dm-event.service for systemd to reload dmeventd properly. Add dm_config_tree_find_str_allow_empty. Fix compile-time pool memory locking with DEBUG_MEM. --- LVM2/libdm/ioctl/libdm-iface.c 2011/10/20 10:38:04 1.126 +++ LVM2/libdm/ioctl/libdm-iface.c 2011/11/08 17:32:11 1.127 @@ -172,7 +172,8 @@ { FILE *fl; char nm[256]; - int c; + char *line; + size_t len; uint32_t num; if (!(fl = fopen(file, "r"))) { @@ -180,8 +181,8 @@ return 0; } - while (!feof(fl)) { - if (fscanf(fl, "%d %255s\n", &num, &nm[0]) == 2) { + while (getline(&line, &len, fl) != -1) { + if (sscanf(line, "%d %255s\n", &num, &nm[0]) == 2) { if (!strcmp(name, nm)) { if (number) { *number = num; @@ -191,9 +192,7 @@ } dm_bit_set(_dm_bitset, num); } - } else do { - c = fgetc(fl); - } while (c != EOF && c != '\n'); + } } if (fclose(fl)) log_sys_error("fclose", file);
next reply other threads:[~2011-11-08 17:32 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-11-08 17:32 snitzer [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-03-01 10:07 zkabelac 2012-02-15 12:17 prajnoha 2012-02-08 12:59 zkabelac 2012-02-08 11:25 zkabelac 2011-10-20 10:38 zkabelac 2011-09-13 15:13 prajnoha 2011-08-11 20:49 zkabelac 2011-07-24 23:59 agk 2011-07-02 1:17 agk 2011-06-09 15:07 mbroz 2011-03-25 23:50 agk 2011-03-08 22:43 zkabelac 2011-03-01 23:27 agk 2011-02-21 16:26 snitzer 2010-08-18 13:11 prajnoha 2010-05-13 13:31 mbroz
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=20111108173212.25065.qmail@sourceware.org \ --to=snitzer@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).