| Message ID | 20170118111320.GA23725@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2017-01-18 at 14:13 +0300, Dan Carpenter wrote: > I was looking through static analysis warnings and there is a bug > here > that goes all the way back to the start of git. Basically we're > copying > the pointer and nearby garbage instead of the data the fd.key pointer > is > pointing to. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > I sent this a year ago, and we had a thread about it, but in the end > decided that the original patch was correct. Not tested. > > diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c > index 5de5c48..75b2542 100644 > --- a/fs/hfs/dir.c > +++ b/fs/hfs/dir.c > @@ -169,7 +169,7 @@ static int hfs_readdir(struct file *file, struct > dir_context *ctx) > * Can be done after the list insertion; exclusion with > * hfs_delete_cat() is provided by directory lock. > */ > - memcpy(&rd->key, &fd.key, sizeof(struct hfs_cat_key)); > + memcpy(&rd->key, &fd.key->cat, sizeof(struct hfs_cat_key)); > out: > hfs_find_exit(&fd); > return err; Looks good. Reviewed-by: Vyacheslav Dubeyko <slava@dubeyko.com> Thanks, Vyacheslav Dubeyko. -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c index 5de5c48..75b2542 100644 --- a/fs/hfs/dir.c +++ b/fs/hfs/dir.c @@ -169,7 +169,7 @@ static int hfs_readdir(struct file *file, struct dir_context *ctx) * Can be done after the list insertion; exclusion with * hfs_delete_cat() is provided by directory lock. */ - memcpy(&rd->key, &fd.key, sizeof(struct hfs_cat_key)); + memcpy(&rd->key, &fd.key->cat, sizeof(struct hfs_cat_key)); out: hfs_find_exit(&fd); return err;
I was looking through static analysis warnings and there is a bug here that goes all the way back to the start of git. Basically we're copying the pointer and nearby garbage instead of the data the fd.key pointer is pointing to. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- I sent this a year ago, and we had a thread about it, but in the end decided that the original patch was correct. Not tested. -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html