From: David Sterba <dsterba@suse.cz>
To: Anand Jain <Anand.Jain@oracle.com>
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 2/3] btrfs-progs: latest_devid is not always the probed devid
Date: Tue, 25 Feb 2014 18:27:09 +0100 [thread overview]
Message-ID: <20140225172709.GZ16073@twin.jikos.cz> (raw)
In-Reply-To: <1393242219-18525-2-git-send-email-Anand.Jain@oracle.com>
On Mon, Feb 24, 2014 at 07:43:38PM +0800, Anand Jain wrote:
> @@ -1646,6 +1646,11 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
> memset(fi_args, 0, sizeof(*fi_args));
>
> if (is_block_device(path)) {
> +
> + struct btrfs_super_block *disk_super;
> + char *buf;
> + u64 devid;
> +
> /* Ensure it's mounted, then set path to the mountpoint */
> fd = open(path, O_RDONLY);
> if (fd < 0) {
> @@ -1665,8 +1670,23 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
> path = mp;
> /* Only fill in this one device */
> fi_args->num_devices = 1;
> - fi_args->max_id = fs_devices_mnt->latest_devid;
> - i = fs_devices_mnt->latest_devid;
> +
> + buf = malloc(4096);
> + if (!buf) {
> + ret = -ENOMEM;
> + goto out;
> + }
> + disk_super = (struct btrfs_super_block *)buf;
> + ret = btrfs_read_dev_super(fd, disk_super, BTRFS_SUPER_INFO_OFFSET);
> + if (ret < 0) {
> + ret = -EIO;
> + goto out;
> + }
> + devid = btrfs_stack_device_id(&disk_super->dev_item);
> +
> + fi_args->max_id = devid;
> + i = devid;
> +
> memcpy(fi_args->fsid, fs_devices_mnt->fsid, BTRFS_FSID_SIZE);
> close(fd);
This is leaking memory, but as this is userspace code we can use the
staack for the superblock. I've committed this with the following fixup:
--- a/utils.c
+++ b/utils.c
@@ -1680,7 +1680,7 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
if (is_block_device(path)) {
struct btrfs_super_block *disk_super;
- char *buf;
+ char buf[BTRFS_SUPER_INFO_SIZE];
u64 devid;
/* Ensure it's mounted, then set path to the mountpoint */
@@ -1703,11 +1703,6 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
/* Only fill in this one device */
fi_args->num_devices = 1;
- buf = malloc(4096);
- if (!buf) {
- ret = -ENOMEM;
- goto out;
- }
disk_super = (struct btrfs_super_block *)buf;
ret = btrfs_read_dev_super(fd, disk_super, BTRFS_SUPER_INFO_OFFSET);
if (ret < 0) {
next prev parent reply other threads:[~2014-02-25 17:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 11:43 [PATCH 1/3 v3] btrfs-progs: there is devid 0 when replace is running Anand Jain
2014-02-24 11:43 ` [PATCH 2/3] btrfs-progs: latest_devid is not always the probed devid Anand Jain
2014-02-25 17:27 ` David Sterba [this message]
2014-02-26 2:06 ` Anand Jain
2014-02-24 11:43 ` [PATCH 3/3] btrfs-progs: Fix bug when scanned for devid which was missing and deleted Anand Jain
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=20140225172709.GZ16073@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=Anand.Jain@oracle.com \
--cc=linux-btrfs@vger.kernel.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: link
Be 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