From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Thu, 02 Jul 2009 10:19:38 +0100 Subject: [Cluster-devel] [PATCH gfs2-utils] don't dereference NULL for a hostdata string with no "=" In-Reply-To: <87hbxzqbd3.fsf@meyering.net> References: <87hbxzqbd3.fsf@meyering.net> Message-ID: <1246526378.3379.0.camel@localhost.localdomain> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, Looks good to me, Steve. On Mon, 2009-06-29 at 17:59 +0200, Jim Meyering wrote: > I didn't try to trigger this failure, but it looks like it'd be easy to do. > Just use a "hostdata" option, but omit the "=". > > > >From a4d5ba668ecdabc9cbeac7a8f6ce5d227edae6b7 Mon Sep 17 00:00:00 2001 > From: Jim Meyering > Date: Mon, 29 Jun 2009 17:58:16 +0200 > Subject: [PATCH gfs2-utils] don't dereference NULL for a hostdata string with no "=" > > * gfs2/mount/util.c (lock_dlm_join): Instead, just ignore it. > --- > gfs2/mount/util.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/gfs2/mount/util.c b/gfs2/mount/util.c > index 57a432a..0e009bd 100644 > --- a/gfs2/mount/util.c > +++ b/gfs2/mount/util.c > @@ -492,9 +492,11 @@ int lock_dlm_join(struct mount_options *mo, struct gen_sb *sb) > if (!mo->hostdata[0]) > snprintf(mo->hostdata, PATH_MAX, "%s", ma.hostdata); > else { > - char *p = strstr(ma.hostdata, "=") + 1; > - strcat(mo->hostdata, ":"); > - strcat(mo->hostdata, p); > + const char *p = strstr(ma.hostdata, "="); > + if (p) { > + strcat(mo->hostdata, ":"); > + strcat(mo->hostdata, p + 1); > + } > } > > log_debug("lock_dlm_join: hostdata: \"%s\"", mo->hostdata); > -- > 1.6.3.3.467.g98a79 >