Skip to contentSkip to conversation

pstore: Fail to unlink if a driver has not defined pstore_erase

PATCH Superseded Aruna Balakrishnaiah 2 participants 3 messages Jun 24, 2013 – Jun 25, 2013 Pstore filesystem

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pstore: Fail to unlink if a driver has not defined pstore_erase

pstore_erase is used to erase the record from the persistent store. So if a driver has not defined pstore_erase callback return -EINVAL instead of unlinking a file as deleting the file without erasing its record in persistent store will give a wrong impression to customers.

---
 fs/pstore/inode.c |    2 ++
 1 file changed, 2 insertions(+)
fs/pstore/inode.c +2 -0
index e4bcb2c..fa6339a 100644
@@ -178,6 +178,8 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
 	if (p->psi->erase)
 		p->psi->erase(p->type, p->id, p->count,
 			      dentry->d_inode->i_ctime, p->psi);
+	else
+		return -EINVAL;
 
 	return simple_unlink(dir, dentry);
 }
#1 lore raw
Quoted 5 lines · Aruna Balakrishnaiah

pstore_erase is used to erase the record from the persistent store. So if a driver has not defined pstore_erase callback return -EINVAL instead of unlinking a file as deleting the file without erasing its record in persistent store will give a wrong impression to customers.

This is probably true -- I originally liked the idea of being able to clean up the entries, regardless of their storage state, but you're probably right. They shouldn't be deleted unless they can _actually_ be deleted.

So, I support this change, but I think the return needs to be different. EINVAL isn't listed, for example, in unlink(2)'s man-page. Perhaps EROFS, EACCESS, or EPERM?

-Kees

Quoted 12 lines
---
 fs/pstore/inode.c |    2 ++
 1 file changed, 2 insertions(+)
fs/pstore/inode.c +0 -0
index e4bcb2c..fa6339a 100644

fs/pstore/inode.c static int pstore_unlink(struct inode *dir, struct dentry *dentry) · line 185

Quoted 8 lines
fs/pstore/inode.c +2 -0
@@ -178,6 +178,8 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
        if (p->psi->erase)
                p->psi->erase(p->type, p->id, p->count,
                              dentry->d_inode->i_ctime, p->psi);
+       else
+               return -EINVAL;
 
        return simple_unlink(dir, dentry);
 }

--
Kees Cook
Chrome OS Security

#2 lore raw

Hi Keek,

Quoted 7 lines · Kees Cook
Quoted 5 lines · Aruna Balakrishnaiah

pstore_erase is used to erase the record from the persistent store. So if a driver has not defined pstore_erase callback return -EINVAL instead of unlinking a file as deleting the file without erasing its record in persistent store will give a wrong impression to customers.

Quoted 8 lines

This is probably true -- I originally liked the idea of being able to clean up the entries, regardless of their storage state, but you're probably right. They shouldn't be deleted unless they can _actually_ be deleted.

So, I support this change, but I think the return needs to be different. EINVAL isn't listed, for example, in unlink(2)'s man-page. Perhaps EROFS, EACCESS, or EPERM?

The filesystem (pstore) has privileges to unlink the file but only if the callback function is defined. Since the filesystem has privileges I didn't consider these error codes (EROFS, EACCESS or EPERM).

In the case where callback function is not defined unlinking the file would be an invalid operation and hence EINVAL.

Since unlink(2) man page does not have EINVAL listed, I feel going with EPERM will make more sense.

Quoted 28 lines

-Kees

Quoted 11 lines
---
  fs/pstore/inode.c |    2 ++
  1 file changed, 2 insertions(+)
fs/pstore/inode.c +0 -0
index e4bcb2c..fa6339a 100644

fs/pstore/inode.c static int pstore_unlink(struct inode *dir, struct dentry *dentry) · line 185

Quoted 8 lines
fs/pstore/inode.c +2 -0
@@ -178,6 +178,8 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
         if (p->psi->erase)
                 p->psi->erase(p->type, p->id, p->count,
                               dentry->d_inode->i_ctime, p->psi);
+       else
+               return -EINVAL;
 
         return simple_unlink(dir, dentry);
  }

--
Kees Cook
Chrome OS Security