public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/clvmd.c Date: Fri, 16 Sep 2011 14:40:00 -0000 [thread overview] Message-ID: <20110916144008.19274.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2011-09-16 14:40:07 Modified files: . : WHATS_NEW daemons/clvmd : clvmd.c Log message: Fix clvmd processing of invalid request on local socket. (rommer) Code now detects small packet and wrong arglen and reply with error intead of infinite loop. https://bugzilla.redhat.com/show_bug.cgi?id=738484 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2115&r2=1.2116 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.c.diff?cvsroot=lvm2&r1=1.108&r2=1.109 --- LVM2/WHATS_NEW 2011/09/16 12:10:02 1.2115 +++ LVM2/WHATS_NEW 2011/09/16 14:40:06 1.2116 @@ -1,5 +1,6 @@ Version 2.02.89 - ================================== + Fix clvmd processing of invalid request on local socket. Fix command line option decoding. Reset LV status when unlinking LV from VG. Fix overly strict extent-count divisibility requirements for striped mirrors. --- LVM2/daemons/clvmd/clvmd.c 2011/08/12 02:16:46 1.108 +++ LVM2/daemons/clvmd/clvmd.c 2011/09/16 14:40:07 1.109 @@ -1061,6 +1061,7 @@ int missing_len; char buffer[PIPE_BUF]; + memset(buffer, 0, PIPE_BUF); len = read(thisfd->fd, buffer, sizeof(buffer)); if (len == -1 && errno == EINTR) return 1; @@ -1169,9 +1170,6 @@ return len; } - /* Free any old buffer space */ - free(thisfd->bits.localsock.cmd); - /* See if we have the whole message */ argslen = len - strlen(inheader->node) - sizeof(struct clvm_header); @@ -1180,6 +1178,22 @@ if (missing_len < 0) missing_len = 0; + /* We need at least sizeof(struct clvm_header) bytes in buffer */ + if (len < sizeof(struct clvm_header) || argslen < 0) { + struct clvm_header reply; + reply.cmd = CLVMD_CMD_REPLY; + reply.status = EINVAL; + reply.arglen = 0; + reply.flags = 0; + send_message(&reply, sizeof(reply), our_csid, + thisfd->fd, + "Error sending EINVAL reply to local user"); + return 0; + } + + /* Free any old buffer space */ + free(thisfd->bits.localsock.cmd); + /* Save the message */ thisfd->bits.localsock.cmd = malloc(len + missing_len); @@ -1203,15 +1217,23 @@ char *argptr = inheader->node + strlen(inheader->node) + 1; - while (missing_len > 0 && len >= 0) { + while (missing_len > 0) { DEBUGLOG ("got %d bytes, need another %d (total %d)\n", argslen, missing_len, inheader->arglen); len = read(thisfd->fd, argptr + argslen, missing_len); - if (len >= 0) { + if (len == -1 && errno == EINTR) + continue; + if (len > 0) { missing_len -= len; argslen += len; + } else { + /* EOF or error on socket */ + DEBUGLOG("EOF on local socket\n"); + free(thisfd->bits.localsock.cmd); + thisfd->bits.localsock.cmd = NULL; + return 0; } } }
next reply other threads:[~2011-09-16 14:40 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-09-16 14:40 mbroz [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-02-28 11:06 zkabelac 2012-02-28 9:58 zkabelac 2012-02-28 9:53 zkabelac 2012-02-27 11:26 zkabelac 2012-02-27 9:58 zkabelac 2011-10-11 9:54 zkabelac 2011-10-11 9:26 zkabelac 2011-08-11 12:57 mbroz 2011-06-28 13:42 zkabelac 2011-03-30 12:36 zkabelac 2011-03-08 22:48 zkabelac 2011-03-08 13:27 mbroz 2010-12-13 10:49 prajnoha 2010-12-01 12:41 zkabelac 2010-12-01 10:46 zkabelac 2010-04-06 15:29 ccaulfield 2010-02-02 8:54 ccaulfield 2009-10-12 8:33 ccaulfield 2009-09-01 9:48 ccaulfield 2009-08-13 10:39 ccaulfield 2009-03-24 11:49 ccaulfield 2008-11-21 13:48 ccaulfield 2008-06-13 7:44 ccaulfield 2008-05-09 9:59 ccaulfield 2008-03-28 12:58 ccaulfield 2008-03-17 9:37 ccaulfield 2008-02-15 14:12 meyering 2007-11-15 10:16 pcaulfield 2007-03-29 13:59 pcaulfield 2006-12-11 13:48 pcaulfield 2006-11-30 9:44 pcaulfield 2005-04-01 13:01 pcaulfield 2005-02-08 9:05 pcaulfield 2005-01-24 15:31 pcaulfield 2005-01-05 14:41 pcaulfield 2004-10-06 12:36 pcaulfield 2004-10-06 10:12 pcaulfield
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=20110916144008.19274.qmail@sourceware.org \ --to=mbroz@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).