diff options
| author | Jean Delvare <khali@linux-fr.org> | 2007-05-06 17:51:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:04 -0400 |
| commit | 0ddb16cfb05c04d644b4ba8e36e780b15f47a191 (patch) | |
| tree | 493bbef734da1fb5a355049333b62d99a9539955 | |
| parent | ee17b36fd0dc2af37ea92548595e30964674ded8 (diff) | |
xtensa: strlcpy is smart enough
strlcpy already accounts for the trailing zero in its length
computation, so there is no need to substract one to the buffer size.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/xtensa/platform-iss/network.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c index ab05bff40104..4bfe333be229 100644 --- a/arch/xtensa/platform-iss/network.c +++ b/arch/xtensa/platform-iss/network.c | |||
| @@ -251,7 +251,7 @@ static int tuntap_open(struct iss_net_private *lp) | |||
| 251 | 251 | ||
| 252 | memset(&ifr, 0, sizeof ifr); | 252 | memset(&ifr, 0, sizeof ifr); |
| 253 | ifr.ifr_flags = IFF_TAP | IFF_NO_PI; | 253 | ifr.ifr_flags = IFF_TAP | IFF_NO_PI; |
| 254 | strlcpy(ifr.ifr_name, dev_name, sizeof ifr.ifr_name - 1); | 254 | strlcpy(ifr.ifr_name, dev_name, sizeof ifr.ifr_name); |
| 255 | 255 | ||
| 256 | if ((err = simc_ioctl(fd, TUNSETIFF, (void*) &ifr)) < 0) { | 256 | if ((err = simc_ioctl(fd, TUNSETIFF, (void*) &ifr)) < 0) { |
| 257 | printk("Failed to set interface, returned %d " | 257 | printk("Failed to set interface, returned %d " |