summaryrefslogtreecommitdiff
path: root/udev_remove.c
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2005-02-09 04:37:32 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:27:32 -0700
commitc1ab046124ebef3c82950b91ccfd1678d9f7fe5b (patch)
tree1b160f9cba6681028f8993ca723300611172b133 /udev_remove.c
parentbce52be81ec679bf080bb11f292c899d9fde084e (diff)
[PATCH] provide temporary device node for callouts to access the device
%N will create a temporary node for a callout a be sustituted with the name of the node.
Diffstat (limited to 'udev_remove.c')
-rw-r--r--udev_remove.c39
1 files changed, 2 insertions, 37 deletions
diff --git a/udev_remove.c b/udev_remove.c
index 142503589a..e1af3dbef6 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -67,41 +67,6 @@ static int delete_path(const char *path)
return 0;
}
-/** Remove all permissions on the device node, before
- * unlinking it. This fixes a security issue.
- * If the user created a hard-link to the device node,
- * he can't use it any longer, because he lost permission
- * to do so.
- */
-static int secure_unlink(const char *filename)
-{
- int retval;
-
- retval = chown(filename, 0, 0);
- if (retval) {
- dbg("chown(%s, 0, 0) failed with error '%s'",
- filename, strerror(errno));
- /* We continue nevertheless.
- * I think it's very unlikely for chown
- * to fail here, if the file exists.
- */
- }
- retval = chmod(filename, 0000);
- if (retval) {
- dbg("chmod(%s, 0000) failed with error '%s'",
- filename, strerror(errno));
- /* We continue nevertheless. */
- }
- retval = unlink(filename);
- if (errno == ENOENT)
- retval = 0;
- if (retval) {
- dbg("unlink(%s) failed with error '%s'",
- filename, strerror(errno));
- }
- return retval;
-}
-
static int delete_node(struct udevice *udev)
{
char filename[NAME_SIZE];
@@ -116,7 +81,7 @@ static int delete_node(struct udevice *udev)
filename[NAME_SIZE-1] = '\0';
info("removing device node '%s'", filename);
- retval = secure_unlink(filename);
+ retval = unlink_secure(filename);
if (retval)
return retval;
@@ -131,7 +96,7 @@ static int delete_node(struct udevice *udev)
for (i = 1; i <= num; i++) {
strfieldcpy(partitionname, filename);
strintcat(partitionname, i);
- secure_unlink(partitionname);
+ unlink_secure(partitionname);
}
}