mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
To: Alan Cox <alan@redhat.com>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
	torvalds@osdl.org
Subject: Re: PATCH: switch ide-proc to use the ide_key functionality
Date: Tue, 17 Aug 2004 01:35:11 +0200	[thread overview]
Message-ID: <200408170135.11465.bzolnier@elka.pw.edu.pl> (raw)
In-Reply-To: <20040815150414.GA12181@devserv.devel.redhat.com>


Alan, 'ide_key' protection misses driver specfiic /proc/entries.

It is also still racy for some drivers because ide_register_hw() -> 
init_hwif_data() sets hwif->key to zero - you must set hwif->hold to 1.

[ There might be other similar problems, need to double check. ]

Can't we solve the problem in simpler way by covering affected /proc
handlers with ide_setting_sem?

On Sunday 15 August 2004 17:04, Alan Cox wrote:
> diff -u --new-file --recursive --exclude-from /usr/src/exclude
> linux.vanilla-2.6.8-rc3/drivers/ide/ide-proc.c
> linux-2.6.8-rc3/drivers/ide/ide-proc.c ---
> linux.vanilla-2.6.8-rc3/drivers/ide/ide-proc.c	2004-08-09
> 15:51:00.000000000 +0100 +++
> linux-2.6.8-rc3/drivers/ide/ide-proc.c	2004-08-12 17:26:00.000000000 +0100
> @@ -355,7 +355,7 @@
>  static int proc_ide_read_identify
>  	(char *page, char **start, off_t off, int count, int *eof, void *data)
>  {
> -	ide_drive_t	*drive = (ide_drive_t *)data;
> +	ide_drive_t	*drive = ide_drive_from_key(data);
>  	int		len = 0, i = 0;
>  	int		err = 0;
>
> @@ -397,11 +397,15 @@
>  static int proc_ide_read_settings
>  	(char *page, char **start, off_t off, int count, int *eof, void *data)
>  {
> -	ide_drive_t	*drive = (ide_drive_t *) data;
> -	ide_settings_t	*setting = (ide_settings_t *) drive->settings;
> +	ide_drive_t	*drive = ide_drive_from_key(data);
> +	ide_settings_t	*setting;
>  	char		*out = page;
>  	int		len, rc, mul_factor, div_factor;
> +
> +	if(drive == NULL)
> +		return -EIO;
>
> +	setting = (ide_settings_t *) drive->settings;
>  	down(&ide_setting_sem);
>  	out += sprintf(out, "name\t\t\tvalue\t\tmin\t\tmax\t\tmode\n");
>  	out += sprintf(out, "----\t\t\t-----\t\t---\t\t---\t\t----\n");
> @@ -431,7 +435,7 @@
>  static int proc_ide_write_settings(struct file *file, const char __user
> *buffer, unsigned long count, void *data)
>  {
> -	ide_drive_t	*drive = (ide_drive_t *) data;
> +	ide_drive_t	*drive = ide_drive_from_key(data);
>  	char		name[MAX_LEN + 1];
>  	int		for_real = 0;
>  	unsigned long	n;
> @@ -440,6 +444,9 @@
>
>  	if (!capable(CAP_SYS_ADMIN))
>  		return -EACCES;
> +
> +	if (drive == NULL)
> +		return -EIO;
>
>  	if (count >= PAGE_SIZE)
>  		return -EINVAL;
> @@ -523,9 +530,12 @@
>  int proc_ide_read_capacity
>  	(char *page, char **start, off_t off, int count, int *eof, void *data)
>  {
> -	ide_drive_t	*drive = (ide_drive_t *) data;
> +	ide_drive_t	*drive = ide_drive_from_key(data);
>  	int		len;
>
> +	if(drive == NULL)
> +		return -EIO;
> +
>  	len = sprintf(page,"%llu\n",
>  		      (long long) (DRIVER(drive)->capacity(drive)));
>  	PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
> @@ -534,9 +544,12 @@
>  int proc_ide_read_geometry
>  	(char *page, char **start, off_t off, int count, int *eof, void *data)
>  {
> -	ide_drive_t	*drive = (ide_drive_t *) data;
> +	ide_drive_t	*drive = ide_drive_from_key(data);
>  	char		*out = page;
>  	int		len;
> +
> +	if(drive == NULL)
> +		return -EIO;
>
>  	out += sprintf(out,"physical     %d/%d/%d\n",
>  			drive->cyl, drive->head, drive->sect);
> @@ -552,10 +565,14 @@
>  static int proc_ide_read_dmodel
>  	(char *page, char **start, off_t off, int count, int *eof, void *data)
>  {
> -	ide_drive_t	*drive = (ide_drive_t *) data;
> -	struct hd_driveid *id = drive->id;
> +	ide_drive_t	*drive = ide_drive_from_key(data);
> +	struct hd_driveid *id;
>  	int		len;
>
> +	if(drive == NULL)
> +		return -EIO;
> +
> +	id = drive->id;
>  	len = sprintf(page, "%.40s\n",
>  		(id && id->model[0]) ? (char *)id->model : "(none)");
>  	PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
> @@ -564,40 +581,30 @@
>  static int proc_ide_read_driver
>  	(char *page, char **start, off_t off, int count, int *eof, void *data)
>  {
> -	ide_drive_t	*drive = (ide_drive_t *) data;
> -	ide_driver_t	*driver = drive->driver;
> +	ide_drive_t	*drive = ide_drive_from_key(data);
> +	ide_driver_t	*driver;
>  	int		len;
>
> +	if(drive == NULL)
> +		return -EIO;
> +
> +	driver = drive->driver;
> +
>  	len = sprintf(page, "%s version %s\n",
>  			driver->name, driver->version);
>  	PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
>  }
>
> -static int proc_ide_write_driver
> -	(struct file *file, const char __user *buffer, unsigned long count, void
> *data) -{
> -	ide_drive_t	*drive = (ide_drive_t *) data;
> -	char name[32];
> -
> -	if (!capable(CAP_SYS_ADMIN))
> -		return -EACCES;
> -	if (count > 31)
> -		count = 31;
> -	if (copy_from_user(name, buffer, count))
> -		return -EFAULT;
> -	name[count] = '\0';
> -	if (ide_replace_subdriver(drive, name))
> -		return -EINVAL;
> -	return count;
> -}
> -
>  static int proc_ide_read_media
>  	(char *page, char **start, off_t off, int count, int *eof, void *data)
>  {
> -	ide_drive_t	*drive = (ide_drive_t *) data;
> +	ide_drive_t	*drive = ide_drive_from_key(data);
>  	const char	*media;
>  	int		len;
>
> +	if(drive == NULL)
> +		return -EINVAL;
> +
>  	switch (drive->media) {
>  		case ide_disk:	media = "disk\n";
>  				break;
> @@ -616,7 +623,7 @@
>  }
>
>  static ide_proc_entry_t generic_drive_entries[] = {
> -	{ "driver",	S_IFREG|S_IRUGO,	proc_ide_read_driver,	proc_ide_write_driver
> }, +	{ "driver",	S_IFREG|S_IRUGO,	proc_ide_read_driver,	NULL },
>  	{ "identify",	S_IFREG|S_IRUSR,	proc_ide_read_identify,	NULL },
>  	{ "media",	S_IFREG|S_IRUGO,	proc_ide_read_media,	NULL },
>  	{ "model",	S_IFREG|S_IRUGO,	proc_ide_read_dmodel,	NULL },
> @@ -668,7 +675,7 @@
>
>  		drive->proc = proc_mkdir(drive->name, parent);
>  		if (drive->proc)
> -			ide_add_proc_entries(drive->proc, generic_drive_entries, drive);
> +			ide_add_proc_entries(drive->proc, generic_drive_entries,
> ide_drive_to_key(drive)); sprintf(name,"ide%d/%s", (drive->name[2]-'a')/2,
> drive->name);
>  		ent = proc_symlink(drive->name, proc_ide_root, name);
>  		if (!ent) return;
>
>
> Signed-off-by: Alan Cox <alan@redhat.com>

  parent reply	other threads:[~2004-08-16 23:37 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-08-15 15:04 Alan Cox
2004-08-16 15:24 ` Bartlomiej Zolnierkiewicz
2004-08-16 15:30   ` Alan Cox
2004-08-16 23:22     ` Bartlomiej Zolnierkiewicz
2004-08-16 23:35 ` Bartlomiej Zolnierkiewicz [this message]
2004-08-17  0:13   ` Alan Cox
2004-08-17  0:31     ` Bartlomiej Zolnierkiewicz
2004-08-17  0:41       ` Alan Cox
2004-08-17  1:05       ` Alan Cox
2004-08-17 10:48         ` Bartlomiej Zolnierkiewicz
2004-08-17 12:06           ` Alan Cox
2004-08-17 22:15             ` Alan Cox

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=200408170135.11465.bzolnier@elka.pw.edu.pl \
    --to=b.zolnierkiewicz@elka.pw.edu.pl \
    --cc=alan@redhat.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.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

all inboxes | Powered by JetHome®