Notice that ip is a u8 *, so currently every other byte is
being truncated here.
Signed-off-by: Harvey Harrison <[email protected]>
---
drivers/firmware/iscsi_ibft.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 4353414..0a64720 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -290,9 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip)
/*
* IPv6
*/
- str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]),
- ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]),
- ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]));
+ str += sprintf(str, "%p6", ip);
}
str += sprintf(str, "\n");
return str - buf;
--
1.6.0.3.729.g6ea410
On Mon, 27 Oct 2008 21:05:17 -0700
Harvey Harrison <[email protected]> wrote:
> Notice that ip is a u8 *, so currently every other byte is
> being truncated here.
>
I don't understand that bug description. The code looks OK to me?
> ---
> drivers/firmware/iscsi_ibft.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
> index 4353414..0a64720 100644
> --- a/drivers/firmware/iscsi_ibft.c
> +++ b/drivers/firmware/iscsi_ibft.c
> @@ -290,9 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip)
> /*
> * IPv6
> */
> - str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]),
> - ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]),
> - ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]));
> + str += sprintf(str, "%p6", ip);
> }
> str += sprintf(str, "\n");
> return str - buf;
Is the data format which sprintf_ipaddr() is parsing specific to iscsi?
If not, that helper function is generic and shouldn't be buried down
in drivers/firmware/iscsi_ibft.c?
On Mon, 2008-11-03 at 12:16 -0800, Andrew Morton wrote:
> On Mon, 27 Oct 2008 21:05:17 -0700
> Harvey Harrison <[email protected]> wrote:
>
> > Notice that ip is a u8 *, so currently every other byte is
> > being truncated here.
> >
>
> I don't understand that bug description. The code looks OK to me?
> > - str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]),
> > - ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]),
> > - ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]));
> > + str += sprintf(str, "%p6", ip);
If ip is a u8 * these ntohs are operating on bytes which is bogus, and
NIP6_FMT expects to get 8 u16s, not 8 u8s.
johannes