From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Wed, 8 May 2019 07:44:11 +0200 Sender: Ladislav Michl From: Ladislav Michl Message-ID: <20190508054411.GA11035@lenoch> References: <20190506174409.GA23081@lenoch> <20190507073128.GA649@lenoch> <20190507154902.GA30791@lenoch> <1557251975.31309.83.camel@impinj.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1557251975.31309.83.camel@impinj.com> Subject: Re: [RAUC] Failed to mount seed slot To: Trent Piepho Cc: rauc@pengutronix.de, Enrico Jorns , Jan Luebbe List-ID: On Tue, May 07, 2019 at 05:59:36PM +0000, Trent Piepho wrote: > On Tue, 2019-05-07 at 17:49 +0200, Ladislav Michl wrote: > > On Tue, May 07, 2019 at 09:31:28AM +0200, Ladislav Michl wrote: > > typedef struct { > > - gboolean is_device; // vs being a loop mounted file > > - dev_t dev; // the device, or for a file, the device the file is on > > - ino_t inode; // inode of file for a non-device > > + gboolean is_device; /* vs being a loop mounted file */ > > + dev_t dev; /* the device, or for a file, the device the file is on */ > > + ino_t inode; /* inode of file for a non-device */ > > } MountableObj; > > There would also need to be another bool to indicate if the device is a > block dev or char dev, since the major:minor could match between > different device types. That could be part of a union with inode since > the two are mutually exclusive. As those functions are close to each other I didn't bothered with creating an union and simply used 1 and 2 for is_device :) Also directory can be a bind mount, so added that as well, however it is not yet tested. --- src/config_file.c | 60 ++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/src/config_file.c b/src/config_file.c index 875e0ee..d966533 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -494,38 +494,44 @@ free: return res; } -// Something that is, or can be, mounted onto a mount point +/* Something that is, or can be, mounted onto a mount point */ typedef struct { - gboolean is_device; // vs being a loop mounted file - dev_t dev; // the device, or for a file, the device the file is on - ino_t inode; // inode of file for a non-device + dev_t dev; /* the device, or for a file, the device the file is on */ + ino_t inode; /* inode of file for a non-device */ + gchar is_device; /* vs being a loop mounted file */ } MountableObj; -// Take a device (or file) path and normalize it -static MountableObj *normalize_mountable_object(const gchar *devicepath) +/* Take a device (or file) path or name and normalize it */ +static gboolean normalize_mountable_object(const gchar *name, MountableObj *obj) { - MountableObj *obj; GStatBuf st; - if (g_stat(devicepath, &st) == -1) { + if (g_stat(name, &st) == -1) { /* Virtual filesystems like devpts trigger case */ - g_debug("Can't stat '%s', assuming unmountable: %s", devicepath, g_strerror(errno)); - return NULL; + g_debug("Can't stat '%s', assuming unmountable: %s", name, g_strerror(errno)); + return FALSE; } - obj = g_new0(MountableObj, 1); - if (S_ISBLK(st.st_mode)) { - obj->is_device = TRUE; + switch (st.st_mode & S_IFMT) { + case S_IFCHR: + obj->is_device = 1; obj->dev = st.st_rdev; - } else if (S_ISREG(st.st_mode)) { - obj->is_device = FALSE; + break; + case S_IFBLK: + obj->is_device = 2; + obj->dev = st.st_rdev; + break; + case S_IFDIR: + case S_IFREG: + obj->is_device = 0; obj->dev = st.st_dev; obj->inode = st.st_ino; - } else { - g_debug("Device '%s' is not something which is mountable", devicepath); - g_clear_pointer(&obj, g_free); + break; + default: + g_debug("Device '%s' is unmountable", name); + return FALSE; } - return obj; + return TRUE; } /* Compare two MountableObj for equality */ @@ -546,24 +552,24 @@ RaucSlot *find_slot_by_device(GHashTable *slots, const gchar *device) { GHashTableIter iter; RaucSlot *slot; - g_autofree MountableObj *obj = NULL; + MountableObj obj; + gboolean normalized; g_return_val_if_fail(slots, NULL); g_return_val_if_fail(device, NULL); - obj = normalize_mountable_object(device); + normalized = normalize_mountable_object(device, &obj); g_hash_table_iter_init(&iter, slots); while (g_hash_table_iter_next(&iter, NULL, (gpointer*) &slot)) { if (g_strcmp0(slot->device, device) == 0) goto out; - // Path doesn't match, but maybe device is same? - if (obj) { - g_autofree MountableObj *slot_obj = - normalize_mountable_object(slot->device); - - if (slot_obj && is_same_mountable_object(obj, slot_obj)) + /* Path doesn't match, but maybe device is the same? */ + if (normalized) { + MountableObj slot_obj; + if (normalize_mountable_object(slot->device, &slot_obj) && + is_same_mountable_object(&obj, &slot_obj)) goto out; } } -- 2.20.1