Whamcloud - gitweb
LU-3095 build: fix 'memory corruption' errors
authorSebastien Buisson <sebastien.buisson@bull.net>
Wed, 3 Apr 2013 09:24:02 +0000 (11:24 +0200)
committerOleg Drokin <oleg.drokin@intel.com>
Thu, 13 Jun 2013 23:21:03 +0000 (19:21 -0400)
Fix 'memory corruption' defects found by Coverity version 6.5.1:
Unbounded source buffer (STRING_SIZE)
Passing string of unknown size to function which expects a string
of a particular size.
Write to pointer after free (USE_AFTER_FREE)
Dereferencing freed pointer.
Also fix leak of dentries.

Signed-off-by: Sebastien Buisson <sebastien.buisson@bull.net>
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: I95a1f877025b2e3b58ace7ed86a82330f64c64a3
Reviewed-on: http://review.whamcloud.com/5926
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Li Wei <wei.g.li@intel.com>
Reviewed-by: Faccini Bruno <bruno.faccini@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/osd-ldiskfs/osd_compat.c
lustre/osp/osp_md_object.c
lustre/utils/liblustreapi.c

index 4794d78..a38e057 100644 (file)
@@ -547,18 +547,21 @@ int osd_obj_add_entry(struct osd_thread_info *info,
  * debug messages to objects in the future, and the legacy space
  * of FID_SEQ_OST_MDT0 will be unused in the future.
  **/
  * debug messages to objects in the future, and the legacy space
  * of FID_SEQ_OST_MDT0 will be unused in the future.
  **/
-static inline void osd_seq_name(char *seq_name, obd_seq seq)
+static inline void osd_seq_name(char *seq_name, size_t name_size, obd_seq seq)
 {
 {
-       sprintf(seq_name, (fid_seq_is_rsvd(seq) ||
-                          fid_seq_is_mdt0(seq)) ? LPU64 : LPX64i,
-               fid_seq_is_idif(seq) ? 0 : seq);
+       snprintf(seq_name, name_size,
+                (fid_seq_is_rsvd(seq) ||
+                 fid_seq_is_mdt0(seq)) ? LPU64 : LPX64i,
+                fid_seq_is_idif(seq) ? 0 : seq);
 }
 
 }
 
-static inline void osd_oid_name(char *name, const struct lu_fid *fid, obd_id id)
+static inline void osd_oid_name(char *name, size_t name_size,
+                               const struct lu_fid *fid, obd_id id)
 {
 {
-       sprintf(name, (fid_seq_is_rsvd(fid_seq(fid)) ||
-               fid_seq_is_mdt0(fid_seq(fid)) ||
-               fid_seq_is_idif(fid_seq(fid))) ? LPU64 : LPX64i, id);
+       snprintf(name, name_size,
+                (fid_seq_is_rsvd(fid_seq(fid)) ||
+                 fid_seq_is_mdt0(fid_seq(fid)) ||
+                 fid_seq_is_idif(fid_seq(fid))) ? LPU64 : LPX64i, id);
 }
 
 /* external locking is required */
 }
 
 /* external locking is required */
@@ -569,7 +572,7 @@ static int osd_seq_load_locked(struct osd_device *osd,
        struct dentry       *seq_dir;
        int                 rc = 0;
        int                 i;
        struct dentry       *seq_dir;
        int                 rc = 0;
        int                 i;
-       char                seq_name[32];
+       char                dir_name[32];
        ENTRY;
 
        if (osd_seq->oos_root != NULL)
        ENTRY;
 
        if (osd_seq->oos_root != NULL)
@@ -578,9 +581,9 @@ static int osd_seq_load_locked(struct osd_device *osd,
        LASSERT(map);
        LASSERT(map->om_root);
 
        LASSERT(map);
        LASSERT(map->om_root);
 
-       osd_seq_name(seq_name, osd_seq->oos_seq);
+       osd_seq_name(dir_name, sizeof(dir_name), osd_seq->oos_seq);
 
 
-       seq_dir = simple_mkdir(map->om_root, osd->od_mnt, seq_name, 0755, 1);
+       seq_dir = simple_mkdir(map->om_root, osd->od_mnt, dir_name, 0755, 1);
        if (IS_ERR(seq_dir))
                GOTO(out_err, rc = PTR_ERR(seq_dir));
        else if (seq_dir->d_inode == NULL)
        if (IS_ERR(seq_dir))
                GOTO(out_err, rc = PTR_ERR(seq_dir));
        else if (seq_dir->d_inode == NULL)
@@ -597,27 +600,30 @@ static int osd_seq_load_locked(struct osd_device *osd,
 
        for (i = 0; i < osd_seq->oos_subdir_count; i++) {
                struct dentry   *dir;
 
        for (i = 0; i < osd_seq->oos_subdir_count; i++) {
                struct dentry   *dir;
-               char         name[32];
 
 
-               sprintf(name, "d%u", i);
-               dir = simple_mkdir(osd_seq->oos_root, osd->od_mnt, name,
+               snprintf(dir_name, sizeof(dir_name), "d%u", i);
+               dir = simple_mkdir(osd_seq->oos_root, osd->od_mnt, dir_name,
                                   0700, 1);
                if (IS_ERR(dir)) {
                                   0700, 1);
                if (IS_ERR(dir)) {
-                       rc = PTR_ERR(dir);
-               } else if (dir->d_inode) {
-                       ldiskfs_set_inode_state(dir->d_inode,
-                                               LDISKFS_STATE_LUSTRE_NO_OI);
-                       osd_seq->oos_dirs[i] = dir;
-                       rc = 0;
-               } else {
-                       LBUG();
+                       GOTO(out_free, rc = PTR_ERR(dir));
+               } else if (dir->d_inode == NULL) {
+                       dput(dir);
+                       GOTO(out_free, rc = -EFAULT);
                }
                }
+
+               ldiskfs_set_inode_state(dir->d_inode, LDISKFS_STATE_LUSTRE_NO_OI);
+               osd_seq->oos_dirs[i] = dir;
        }
 
        }
 
-       if (rc != 0)
-               osd_seq_free(map, osd_seq);
-out_put:
        if (rc != 0) {
        if (rc != 0) {
+out_free:
+               for (i = 0; i < osd_seq->oos_subdir_count; i++) {
+                       if (osd_seq->oos_dirs[i] != NULL)
+                               dput(osd_seq->oos_dirs[i]);
+               }
+               OBD_FREE(osd_seq->oos_dirs,
+                        sizeof(seq_dir) * osd_seq->oos_subdir_count);
+out_put:
                dput(seq_dir);
                osd_seq->oos_root = NULL;
        }
                dput(seq_dir);
                osd_seq->oos_root = NULL;
        }
@@ -711,7 +717,7 @@ int osd_obj_map_lookup(struct osd_thread_info *info, struct osd_device *dev,
        d_seq = osd_seq->oos_dirs[dirn];
        LASSERT(d_seq);
 
        d_seq = osd_seq->oos_dirs[dirn];
        LASSERT(d_seq);
 
-       osd_oid_name(name, fid, ostid_id(ostid));
+       osd_oid_name(name, sizeof(name), fid, ostid_id(ostid));
 
        child = &info->oti_child_dentry;
        child->d_parent = d_seq;
 
        child = &info->oti_child_dentry;
        child->d_parent = d_seq;
@@ -767,7 +773,7 @@ int osd_obj_map_insert(struct osd_thread_info *info,
        d = osd_seq->oos_dirs[dirn];
         LASSERT(d);
 
        d = osd_seq->oos_dirs[dirn];
         LASSERT(d);
 
-       osd_oid_name(name, fid, ostid_id(ostid));
+       osd_oid_name(name, sizeof(name), fid, ostid_id(ostid));
        rc = osd_obj_add_entry(info, osd, d, name, id, th);
 
         RETURN(rc);
        rc = osd_obj_add_entry(info, osd, d, name, id, th);
 
         RETURN(rc);
@@ -798,7 +804,7 @@ int osd_obj_map_delete(struct osd_thread_info *info, struct osd_device *osd,
        d = osd_seq->oos_dirs[dirn];
        LASSERT(d);
 
        d = osd_seq->oos_dirs[dirn];
        LASSERT(d);
 
-       osd_oid_name(name, fid, ostid_id(ostid));
+       osd_oid_name(name, sizeof(name), fid, ostid_id(ostid));
        rc = osd_obj_del_entry(info, osd, d, name, th);
 cleanup:
         RETURN(rc);
        rc = osd_obj_del_entry(info, osd, d, name, th);
 cleanup:
         RETURN(rc);
index 9a59588..c3805f9 100644 (file)
@@ -160,8 +160,8 @@ int osp_trans_stop(const struct lu_env *env, struct thandle *th)
 {
        int rc = 0;
 
 {
        int rc = 0;
 
-       osp_destroy_update_req(th->th_current_request);
        rc = th->th_current_request->ur_rc;
        rc = th->th_current_request->ur_rc;
+       osp_destroy_update_req(th->th_current_request);
        th->th_current_request = NULL;
 
        return rc;
        th->th_current_request = NULL;
 
        return rc;
index ce51960..9355b10 100644 (file)
@@ -4219,13 +4219,18 @@ int llapi_create_volatile_idx(char *directory, int idx, int mode)
                return -errno;
        }
        if (idx == -1)
                return -errno;
        }
        if (idx == -1)
-               sprintf(filename, LUSTRE_VOLATILE_HDR"::%.4X", random);
+               snprintf(filename, sizeof(filename),
+                        LUSTRE_VOLATILE_HDR"::%.4X", random);
        else
        else
-               sprintf(filename, LUSTRE_VOLATILE_IDX"%.4X", 0, random);
+               snprintf(filename, sizeof(filename),
+                        LUSTRE_VOLATILE_IDX"%.4X", 0, random);
 
 
-       sprintf(file_path, "%s/%s", directory, filename);
+       rc = snprintf(file_path, sizeof(file_path),
+                     "%s/%s", directory, filename);
+       if (rc >= sizeof(file_path))
+               return -E2BIG;
 
 
-       fd = open(file_path, O_RDWR|O_CREAT|mode, S_IRUSR|S_IWUSR);
+       fd = open(file_path, (O_RDWR | O_CREAT | mode), (S_IRUSR | S_IWUSR));
        if (fd < 0) {
                llapi_error(LLAPI_MSG_ERROR, errno,
                            "Cannot create volatile file %s in %s\n",
        if (fd < 0) {
                llapi_error(LLAPI_MSG_ERROR, errno,
                            "Cannot create volatile file %s in %s\n",