From: Jeff Garzik <jgarzik@pobox.com>
To: davej@redhat.com
Cc: torvalds@osdl.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] remove unnecessary checks in pcmcia
Date: Mon, 29 Sep 2003 13:22:17 -0400 [thread overview]
Message-ID: <20030929172217.GC6526@gtf.org> (raw)
In-Reply-To: <E1A41Rq-0000NP-00@hardwired>
On Mon, Sep 29, 2003 at 06:04:34PM +0100, davej@redhat.com wrote:
> io->stop/start are 16 bits, so will never be >0xffff
>
> diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/pcmcia/i82092.c linux-2.5/drivers/pcmcia/i82092.c
> --- bk-linus/drivers/pcmcia/i82092.c 2003-09-13 14:44:55.000000000 +0100
> +++ linux-2.5/drivers/pcmcia/i82092.c 2003-09-13 16:20:24.000000000 +0100
> @@ -675,7 +675,7 @@ static int i82092aa_set_io_map(struct pc
> leave("i82092aa_set_io_map with invalid map");
> return -EINVAL;
> }
> - if ((io->start > 0xffff) || (io->stop > 0xffff) || (io->stop < io->start)){
> + if (io->stop < io->start) {
> leave("i82092aa_set_io_map with invalid io");
> return -EINVAL;
> }
I would think the code should fail on ==0 and ==0xffff, no?
Also, does this need the "if map > 1" check the code below has?
> diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/pcmcia/i82365.c linux-2.5/drivers/pcmcia/i82365.c
> --- bk-linus/drivers/pcmcia/i82365.c 2003-09-11 21:18:34.000000000 +0100
> +++ linux-2.5/drivers/pcmcia/i82365.c 2003-09-12 15:37:05.000000000 +0100
> @@ -1143,8 +1143,8 @@ static int i365_set_io_map(u_short sock,
> "%#4.4x-%#4.4x)\n", sock, io->map, io->flags,
> io->speed, io->start, io->stop);
> map = io->map;
> - if ((map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||
> - (io->stop < io->start)) return -EINVAL;
> + if ((map > 1) || (io->stop < io->start))
> + return -EINVAL;
> /* Turn off the window before changing anything */
> if (i365_get(sock, I365_ADDRWIN) & I365_ENA_IO(map))
> i365_bclr(sock, I365_ADDRWIN, I365_ENA_IO(map));
likewise
> diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/pcmcia/tcic.c linux-2.5/drivers/pcmcia/tcic.c
> --- bk-linus/drivers/pcmcia/tcic.c 2003-09-11 21:18:34.000000000 +0100
> +++ linux-2.5/drivers/pcmcia/tcic.c 2003-09-12 15:37:05.000000000 +0100
> @@ -786,8 +786,8 @@ static int tcic_set_io_map(struct pcmcia
> DEBUG(1, "tcic: SetIOMap(%d, %d, %#2.2x, %d ns, "
> "%#4.4x-%#4.4x)\n", lsock, io->map, io->flags,
> io->speed, io->start, io->stop);
> - if ((io->map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||
> - (io->stop < io->start)) return -EINVAL;
> + if ((io->map > 1) || (io->stop < io->start))
> + return -EINVAL;
> tcic_setw(TCIC_ADDR+2, TCIC_ADR2_INDREG | (psock << TCIC_SS_SHFT));
> addr = TCIC_IWIN(psock, io->map);
likewise
prev parent reply other threads:[~2003-09-29 17:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-09-29 17:04 [PATCH] remove unnecessary checks in pcmcia davej
2003-09-29 17:19 ` Russell King
2003-09-29 17:20 ` Dave Jones
2003-09-29 17:22 ` Jeff Garzik [this message]
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=20030929172217.GC6526@gtf.org \
--to=jgarzik@pobox.com \
--cc=davej@redhat.com \
--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