2003-07-21 07:48:48 +04:00
/*
* udev - remove . c
*
* Userspace devfs
*
* Copyright ( C ) 2003 Greg Kroah - Hartman < greg @ kroah . com >
*
*
* This program is free software ; you can redistribute it and / or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation version 2 of the License .
*
* This program is distributed in the hope that it will be useful , but
* WITHOUT ANY WARRANTY ; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the GNU
* General Public License for more details .
*
* You should have received a copy of the GNU General Public License along
* with this program ; if not , write to the Free Software Foundation , Inc . ,
* 675 Mass Ave , Cambridge , MA 0213 9 , USA .
*
*/
# include <stdlib.h>
# include <string.h>
2004-10-19 06:11:51 +04:00
# include <stddef.h>
2003-07-21 07:48:48 +04:00
# include <stdio.h>
# include <fcntl.h>
# include <unistd.h>
# include <errno.h>
2004-10-19 10:14:20 +04:00
# include <sys/stat.h>
2003-07-21 07:48:48 +04:00
# include "udev.h"
2004-11-25 04:44:38 +03:00
# include "udev_utils.h"
2003-07-21 07:48:48 +04:00
# include "udev_version.h"
# include "namedev.h"
2004-11-12 08:32:19 +03:00
# include "udev_db.h"
# include "logging.h"
2003-07-21 07:48:48 +04:00
2004-10-19 06:28:39 +04:00
static int delete_path ( const char * path )
2003-07-21 07:48:48 +04:00
{
2003-12-07 20:12:07 +03:00
char * pos ;
int retval ;
2003-07-21 07:48:48 +04:00
2003-12-07 20:12:07 +03:00
pos = strrchr ( path , ' / ' ) ;
while ( 1 ) {
* pos = ' \0 ' ;
pos = strrchr ( path , ' / ' ) ;
/* don't remove the last one */
if ( ( pos = = path ) | | ( pos = = NULL ) )
break ;
/* remove if empty */
retval = rmdir ( path ) ;
2004-03-02 09:34:12 +03:00
if ( errno = = ENOENT )
retval = 0 ;
2003-12-07 20:12:07 +03:00
if ( retval ) {
if ( errno = = ENOTEMPTY )
return 0 ;
dbg ( " rmdir(%s) failed with error '%s' " ,
path , strerror ( errno ) ) ;
break ;
}
dbg ( " removed '%s' " , path ) ;
2003-10-21 09:48:44 +04:00
}
2003-12-07 20:12:07 +03:00
return 0 ;
2003-07-21 07:48:48 +04:00
}
2004-08-10 11:46:38 +04:00
/** 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 ;
}
2004-11-06 16:28:01 +03:00
static int delete_node ( struct udevice * udev )
2003-07-21 07:48:48 +04:00
{
2004-03-04 05:16:35 +03:00
char filename [ NAME_SIZE ] ;
char partitionname [ NAME_SIZE ] ;
2003-11-12 14:48:01 +03:00
int retval ;
2004-02-17 08:44:28 +03:00
int i ;
[PATCH] better fix for NAME="foo-%c{N}" gets a truncated name
On Wed, Mar 03, 2004 at 04:56:34PM -0800, Greg KH wrote:
> On Wed, Mar 03, 2004 at 03:57:04PM -0800, Patrick Mansfield wrote:
> >
> > Here is a patch for some new tests.
>
> Applied, thanks.
Here is a small improvement, which looks much better.
Hey Pat, thanks a lot for finding the recent bug, hope this one will
not break it again :)
2004-03-05 05:55:34 +03:00
char * pos ;
int len ;
2004-10-14 10:13:26 +04:00
int num ;
2003-07-21 07:48:48 +04:00
2004-11-12 08:21:16 +03:00
snprintf ( filename , NAME_SIZE , " %s/%s " , udev_root , udev - > name ) ;
2004-11-06 16:28:01 +03:00
filename [ NAME_SIZE - 1 ] = ' \0 ' ;
2003-07-21 07:48:48 +04:00
[PATCH] add udev logging to info log
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
2004-01-16 08:53:20 +03:00
info ( " removing device node '%s' " , filename ) ;
2004-08-10 11:46:38 +04:00
retval = secure_unlink ( filename ) ;
if ( retval )
2003-11-12 14:48:01 +03:00
return retval ;
2004-10-14 10:13:26 +04:00
/* remove all_partitions nodes */
2004-11-06 16:28:01 +03:00
num = udev - > partitions ;
2004-10-14 10:13:26 +04:00
if ( num > 0 ) {
info ( " removing all_partitions '%s[1-%i]' " , filename , num ) ;
if ( num > PARTITIONS_COUNT ) {
info ( " garbage from udev database, skip all_partitions removal " ) ;
return - 1 ;
}
for ( i = 1 ; i < = num ; i + + ) {
2004-02-28 12:59:02 +03:00
strfieldcpy ( partitionname , filename ) ;
strintcat ( partitionname , i ) ;
2004-08-10 11:46:38 +04:00
secure_unlink ( partitionname ) ;
2004-02-17 08:44:28 +03:00
}
}
2003-11-12 14:48:01 +03:00
/* remove subdirectories */
2004-11-06 16:28:01 +03:00
if ( strchr ( udev - > name , ' / ' ) )
2003-12-07 20:12:07 +03:00
delete_path ( filename ) ;
2004-11-06 16:28:01 +03:00
foreach_strpart ( udev - > symlink , " " , pos , len ) {
char linkname [ NAME_SIZE ] ;
2004-03-10 06:50:15 +03:00
strfieldcpymax ( linkname , pos , len + 1 ) ;
2004-11-12 08:21:16 +03:00
snprintf ( filename , NAME_SIZE , " %s/%s " , udev_root , linkname ) ;
2004-11-06 16:28:01 +03:00
filename [ NAME_SIZE - 1 ] = ' \0 ' ;
2004-03-04 05:16:35 +03:00
dbg ( " unlinking symlink '%s' " , filename ) ;
retval = unlink ( filename ) ;
if ( errno = = ENOENT )
retval = 0 ;
if ( retval ) {
dbg ( " unlink(%s) failed with error '%s' " ,
filename , strerror ( errno ) ) ;
return retval ;
}
2004-11-06 16:28:01 +03:00
if ( strchr ( udev - > symlink , ' / ' ) ) {
2004-03-04 05:16:35 +03:00
delete_path ( filename ) ;
2003-11-12 14:48:01 +03:00
}
}
2003-12-07 20:12:07 +03:00
2003-11-12 14:48:01 +03:00
return retval ;
2003-07-21 07:48:48 +04:00
}
2003-12-07 20:12:07 +03:00
/*
2004-10-19 06:11:51 +04:00
* look up the sysfs path in the database to get the node name to remove
* If we can ' t find it , use kernel name for lack of anything else to know to do
2003-12-07 20:12:07 +03:00
*/
2004-10-19 06:11:51 +04:00
int udev_remove_device ( struct udevice * udev )
2003-07-21 07:48:48 +04:00
{
2004-10-19 06:28:39 +04:00
const char * temp ;
2003-12-20 05:29:01 +03:00
int retval ;
2004-10-19 06:28:39 +04:00
if ( udev - > type ! = ' b ' & & udev - > type ! = ' c ' )
return 0 ;
2003-07-21 07:48:48 +04:00
2004-11-12 08:32:19 +03:00
retval = udev_db_get_device ( udev ) ;
2004-11-06 16:28:01 +03:00
if ( retval ) {
2004-10-19 06:11:51 +04:00
/* fall back to kernel name */
temp = strrchr ( udev - > devpath , ' / ' ) ;
[PATCH] netdev - udevdb+dev.d changes
Here is a patch to change the netdev handling in the database and for
the dev.d/ calls. I applies on top of the udevd.patch, cause klibc has
no sysinfo().
o netdev's are also put into our database now. I want this for the
udevruler gui to get a list of all handled devices.
All devices in the db are stamped with the system uptime value at
the creation time. 'udevinfo -d' prints it.
o the DEVPATH value is the key for udevdb, but if we rename
a netdev, the name is replaced in the kernel, so we add
the changed name to the db to match with the remove event.
NOTE: The dev.d/ scripts still get the original name from the
hotplug call. Should we replace DEVPATH with the new name too?
o We now only add a device to the db, if we have successfully created
the main node or successfully renamed a netdev. This is the main part
of the patch, cause I needed to clean the retval passing trough all
the functions used for node creation.
o DEVNODE sounds a bit ugly for netdev's so I exported DEVNAME too.
Can we change the name?
o I've added a UDEV_NO_DEVD to possibly skip the script execution
and used it in udev-test.pl.
udevstart is the same horror now, if you have scripts with logging
statements in dev.d/ it takes minutes to finish, can we skip the
scripts here too?
o The get_device_type() function is changed to be more strict, cause
'udevinfo -a -p /block/' gets a class device for it and tries to
print the major/minor values.
o bugfix, the RESULT value has now a working newline removal and a test
for this case.
2004-04-01 11:12:57 +04:00
if ( temp = = NULL )
return - ENODEV ;
2004-10-19 06:11:51 +04:00
strfieldcpy ( udev - > name , & temp [ 1 ] ) ;
dbg ( " '%s' not found in database, falling back on default name " , udev - > name ) ;
[PATCH] netdev - udevdb+dev.d changes
Here is a patch to change the netdev handling in the database and for
the dev.d/ calls. I applies on top of the udevd.patch, cause klibc has
no sysinfo().
o netdev's are also put into our database now. I want this for the
udevruler gui to get a list of all handled devices.
All devices in the db are stamped with the system uptime value at
the creation time. 'udevinfo -d' prints it.
o the DEVPATH value is the key for udevdb, but if we rename
a netdev, the name is replaced in the kernel, so we add
the changed name to the db to match with the remove event.
NOTE: The dev.d/ scripts still get the original name from the
hotplug call. Should we replace DEVPATH with the new name too?
o We now only add a device to the db, if we have successfully created
the main node or successfully renamed a netdev. This is the main part
of the patch, cause I needed to clean the retval passing trough all
the functions used for node creation.
o DEVNODE sounds a bit ugly for netdev's so I exported DEVNAME too.
Can we change the name?
o I've added a UDEV_NO_DEVD to possibly skip the script execution
and used it in udev-test.pl.
udevstart is the same horror now, if you have scripts with logging
statements in dev.d/ it takes minutes to finish, can we skip the
scripts here too?
o The get_device_type() function is changed to be more strict, cause
'udevinfo -a -p /block/' gets a class device for it and tries to
print the major/minor values.
o bugfix, the RESULT value has now a working newline removal and a test
for this case.
2004-04-01 11:12:57 +04:00
}
[PATCH] D-BUS patch for udev-008
Attached is a patch against udev-008 to send out a D-BUS message when a
device node is added or removed.
Using D-BUS lingo, udev acquires the org.kernel.udev service and sends
out a NodeCreated or NodeDeleted signal on the
org.kernel.udev.NodeMonitor interface. Each signal carries two
parameters: the node in question and the corresponding sysfs path.
[Note: the D-BUS concepts of service, interface, object can be a bit
confusing at first glance]
An example program listening for these messages looks like this
#!/usr/bin/python
import dbus
import gtk
def udev_signal_received(dbus_iface, member, service, object_path, message):
[filename, sysfs_path] = message.get_args_list()
if member=='NodeCreated':
print 'Node %s created for %s'%(filename, sysfs_path)
elif member=='NodeDeleted':
print 'Node %s deleted for %s'%(filename, sysfs_path)
def main():
bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
bus.add_signal_receiver(udev_signal_received,
'org.kernel.udev.NodeMonitor', # interface
'org.kernel.udev', # service
'/org/kernel/udev/NodeMonitor') # object
gtk.mainloop()
if __name__ == '__main__':
main()
and this is the output when hot-plugging some usb-storage.
[david@laptop udev-008]$ ~/node_monitor.py
Node /udev/sda created for /block/sda
Node /udev/sda1 created for /block/sda/sda1
Node /udev/sda1 deleted for /block/sda/sda1
Node /udev/sda deleted for /block/sda
The patch requires D-BUS 0.20 or later while the python example program
requires D-BUS from CVS as I only recently applied a patch against the
python bindings.
2003-12-08 20:19:19 +03:00
2004-11-13 16:43:24 +03:00
if ( udev - > ignore_remove ) {
dbg ( " remove event for '%s' requested to be ignored by rule " , udev - > name ) ;
return 0 ;
}
2004-10-19 06:28:39 +04:00
dbg ( " remove name='%s' " , udev - > name ) ;
2004-11-12 08:32:19 +03:00
udev_db_delete_device ( udev ) ;
[PATCH] hmm, handle net devices with udev?
Hmm, Arndt Bergmann sent a patch like this one a few weeks ago and
I want to bring the question back, if we want to handle net device
naming with udev.
With this patch it is actually possible to specify something like this
in udev.rules:
KERNEL="dummy*", SYSFS{address}="00:00:00:00:00:00", SYSFS{features}="0x0", NAME="blind%n"
KERNEL="eth*", SYSFS{address}="00:0d:60:77:30:91", NAME="private"
and you will get:
[root@pim udev.kay]# cat /proc/net/dev
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
lo: 1500 30 0 0 0 0 0 0 1500 30 0 0 0 0 0 0
private: 278393 1114 0 0 0 0 0 0 153204 1468 0 0 0 0 0 0
sit0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
blind0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
The udevinfo program is also working:
[root@pim udev.kay]# ./udevinfo -a -p /sys/class/net/private
looking at class device '/sys/class/net/private':
SYSFS{addr_len}="6"
SYSFS{address}="00:0d:60:77:30:91"
SYSFS{broadcast}="ff:ff:ff:ff:ff:ff"
SYSFS{features}="0x3a9"
SYSFS{flags}="0x1003"
SYSFS{ifindex}="2"
SYSFS{iflink}="2"
SYSFS{mtu}="1500"
SYSFS{tx_queue_len}="1000"
SYSFS{type}="1"
follow the class device's "device"
looking at the device chain at '/sys/devices/pci0000:00/0000:00:1e.0/0000:02:01.0':
BUS="pci"
ID="0000:02:01.0"
SYSFS{class}="0x020000"
SYSFS{detach_state}="0"
SYSFS{device}="0x101e"
SYSFS{irq}="11"
SYSFS{subsystem_device}="0x0549"
SYSFS{subsystem_vendor}="0x1014"
SYSFS{vendor}="0x8086"
The matching device will be renamed to the given name. The device name
will not be put into the udev database, cause the kernel renames the
device and the sysfs name disappears.
I like it, cause it plugs in nicely. We have all the naming features
and sysfs queries and walks inside of udev. The sysfs timing races
are already solved and the management tools are working for net devices
too. nameif can only match the MAC address now. udev can match any sysfs
value of the device tree the net device is connected to.
But right, net devices do not have device nodes :)
2004-03-25 10:19:39 +03:00
2004-10-19 06:28:39 +04:00
/* use full path to the environment */
2004-11-12 08:21:16 +03:00
snprintf ( udev - > devname , NAME_SIZE , " %s/%s " , udev_root , udev - > name ) ;
2003-12-08 20:40:40 +03:00
2004-10-19 06:28:39 +04:00
return delete_node ( udev ) ;
2003-07-21 07:48:48 +04:00
}