korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-16 14:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into net-next

Browse Source
This commit is contained in:
Stephen Hemminger 2017-08-24 15:30:32 -07:00
commit f474588028
18 changed files with 86 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ip/ipntable.c
View File

@ -37,7 +37,7 @@ static struct
int family;
int index;
#define NONE_DEV (-1)
char name[1024];
const char *name;
} filter;
static void usage(void) __attribute__((noreturn));
@ -367,7 +367,7 @@ static int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void
if (tb[NDTA_NAME]) {
const char *name = rta_getattr_str(tb[NDTA_NAME]);
if (strlen(filter.name) > 0 && strcmp(filter.name, name))
if (filter.name && strcmp(filter.name, name))
return 0;
}
if (tb[NDTA_PARMS]) {
@ -631,7 +631,7 @@ static int ipntable_show(int argc, char **argv)
} else if (strcmp(*argv, "name") == 0) {
NEXT_ARG();
strncpy(filter.name, *argv, sizeof(filter.name));
filter.name = *argv;
} else
invarg("unknown", *argv);

7
lib/bpf.c
View File

@ -591,7 +591,8 @@ int bpf_trace_pipe(void)
ret = read(fd, buff, sizeof(buff) - 1);
if (ret > 0) {
write(2, buff, ret);
if (write(STDERR_FILENO, buff, ret) != ret)
return -1;
fflush(stderr);
}
}
@ -1516,7 +1517,7 @@ static int bpf_find_map_id(const struct bpf_elf_ctx *ctx, uint32_t id)
return -ENOENT;
}
static void bpf_report_map_in_map(int outer_fd, int inner_fd, uint32_t idx)
static void bpf_report_map_in_map(int outer_fd, uint32_t idx)
{
struct bpf_elf_map outer_map;
int ret;
@ -1683,7 +1684,7 @@ static int bpf_maps_attach_all(struct bpf_elf_ctx *ctx)
&inner_fd, BPF_ANY);
if (ret < 0) {
bpf_report_map_in_map(ctx->map_fds[j],
inner_fd, inner_idx);
inner_idx);
return ret;
}
}

22
lib/fs.c
View File

@ -45,7 +45,7 @@ static char *find_fs_mount(const char *fs_to_find)
return NULL;
}
while (fscanf(fp, "%*s %4096s %127s %*s %*d %*d\n",
while (fscanf(fp, "%*s %4095s %127s %*s %*d %*d\n",
path, fstype) == 2) {
if (strcmp(fstype, fs_to_find) == 0) {
mnt = strdup(path);
@ -102,7 +102,6 @@ out:
int make_path(const char *path, mode_t mode)
{
char *dir, *delim;
struct stat sbuf;
int rc = -1;
delim = dir = strdup(path);
@ -120,20 +119,11 @@ int make_path(const char *path, mode_t mode)
if (delim)
*delim = '\0';
if (stat(dir, &sbuf) != 0) {
if (errno != ENOENT) {
fprintf(stderr,
"stat failed for %s: %s\n",
dir, strerror(errno));
goto out;
}
if (mkdir(dir, mode) != 0) {
fprintf(stderr,
"mkdir failed for %s: %s\n",
dir, strerror(errno));
goto out;
}
rc = mkdir(dir, mode);
if (mkdir(dir, mode) != 0 && errno != EEXIST) {
fprintf(stderr, "mkdir failed for %s: %s\n",
dir, strerror(errno));
goto out;
}
if (delim == NULL)

24
lib/inet_proto.c
View File

@ -25,7 +25,7 @@
const char *inet_proto_n2a(int proto, char *buf, int len)
{
static char ncache[16];
static char *ncache;
static int icache = -1;
struct protoent *pe;
@ -34,9 +34,12 @@ const char *inet_proto_n2a(int proto, char *buf, int len)
pe = getprotobynumber(proto);
if (pe) {
if (icache != -1)
free(ncache);
icache = proto;
strncpy(ncache, pe->p_name, 16);
strncpy(buf, pe->p_name, len);
ncache = strdup(pe->p_name);
strncpy(buf, pe->p_name, len - 1);
buf[len - 1] = '\0';
return buf;
}
snprintf(buf, len, "ipproto-%d", proto);
@ -45,24 +48,23 @@ const char *inet_proto_n2a(int proto, char *buf, int len)
int inet_proto_a2n(const char *buf)
{
static char ncache[16];
static char *ncache;
static int icache = -1;
struct protoent *pe;
__u8 ret;
if (icache>=0 && strcmp(ncache, buf) == 0)
if (icache != -1 && strcmp(ncache, buf) == 0)
return icache;
if (buf[0] >= '0' && buf[0] <= '9') {
__u8 ret;
if (get_u8(&ret, buf, 10))
return -1;
if (!get_u8(&ret, buf, 10))
return ret;
}
pe = getprotobyname(buf);
if (pe) {
if (icache != -1)
free(ncache);
icache = pe->p_proto;
strncpy(ncache, pe->p_name, 16);
ncache = strdup(pe->p_name);
return pe->p_proto;
}
return -1;

11
lib/libnetlink.c
View File

@ -354,8 +354,7 @@ int rtnl_dump_request_n(struct rtnl_handle *rth, struct nlmsghdr *n)
return sendmsg(rth->fd, &msg, 0);
}
static int rtnl_dump_done(const struct rtnl_handle *rth,
struct nlmsghdr *h)
static int rtnl_dump_done(struct nlmsghdr *h)
{
int len = *(int *)NLMSG_DATA(h);
@ -462,7 +461,7 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth,
dump_intr = 1;
if (h->nlmsg_type == NLMSG_DONE) {
err = rtnl_dump_done(rth, h);
err = rtnl_dump_done(h);
if (err < 0)
return -1;
@ -871,7 +870,8 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
rta = NLMSG_TAIL(n);
rta->rta_type = type;
rta->rta_len = len;
memcpy(RTA_DATA(rta), data, alen);
if (alen)
memcpy(RTA_DATA(rta), data, alen);
n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
return 0;
}
@ -958,7 +958,8 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type,
subrta = (struct rtattr *)(((char *)rta) + RTA_ALIGN(rta->rta_len));
subrta->rta_type = type;
subrta->rta_len = len;
memcpy(RTA_DATA(subrta), data, alen);
if (alen)
memcpy(RTA_DATA(subrta), data, alen);
rta->rta_len = NLMSG_ALIGN(rta->rta_len) + RTA_ALIGN(len);
return 0;
}

4
lib/ll_map.c
View File

@ -30,7 +30,7 @@ struct ll_cache {
unsigned flags;
unsigned index;
unsigned short type;
char name[IFNAMSIZ];
char name[];
};
#define IDXMAP_SIZE 1024
@ -120,7 +120,7 @@ int ll_remember_index(const struct sockaddr_nl *who,
return 0;
}
im = malloc(sizeof(*im));
im = malloc(sizeof(*im) + strlen(ifname) + 1);
if (im == NULL)
return 0;
im->index = ifi->ifi_index;

4
man/man8/ss.8
View File

@ -153,14 +153,14 @@ Available identifiers are:
All standard TCP states:
.BR established ", " syn-sent ", " syn-recv ", " fin-wait-1 ", " fin-wait-2 ", " time-wait ", " closed ", " close-wait ", " last-ack ", "
.BR listen " and " closing.
.BR listening " and " closing.
.B all
- for all the states
.B connected
- all the states except for
.BR listen " and " closed
.BR listening " and " closed
.B synchronized
- all the

16
misc/ifstat.c
View File

@ -992,12 +992,18 @@ int main(int argc, char *argv[])
&& verify_forging(fd) == 0) {
FILE *sfp = fdopen(fd, "r");
load_raw_table(sfp);
if (hist_db && source_mismatch) {
fprintf(stderr, "ifstat: history is stale, ignoring it.\n");
hist_db = NULL;
if (!sfp) {
fprintf(stderr, "ifstat: fdopen failed: %s\n",
strerror(errno));
close(fd);
} else {
load_raw_table(sfp);
if (hist_db && source_mismatch) {
fprintf(stderr, "ifstat: history is stale, ignoring it.\n");
hist_db = NULL;
}
fclose(sfp);
}
fclose(sfp);
} else {
if (fd >= 0)
close(fd);

7
misc/lnstat_util.c
View File

@ -180,11 +180,8 @@ static struct lnstat_file *alloc_and_open(const char *path, const char *file)
}
/* initialize */
/* de->d_name is guaranteed to be <= NAME_MAX */
strcpy(lf->basename, file);
strcpy(lf->path, path);
strcat(lf->path, "/");
strcat(lf->path, lf->basename);
snprintf(lf->basename, sizeof(lf->basename), "%s", file);
snprintf(lf->path, sizeof(lf->path), "%s/%s", path, file);
/* initialize to default */
lf->interval.tv_sec = 1;

16
misc/nstat.c
View File

@ -706,12 +706,18 @@ int main(int argc, char *argv[])
&& verify_forging(fd) == 0) {
FILE *sfp = fdopen(fd, "r");
load_good_table(sfp);
if (hist_db && source_mismatch) {
fprintf(stderr, "nstat: history is stale, ignoring it.\n");
hist_db = NULL;
if (!sfp) {
fprintf(stderr, "nstat: fdopen failed: %s\n",
strerror(errno));
close(fd);
} else {
load_good_table(sfp);
if (hist_db && source_mismatch) {
fprintf(stderr, "nstat: history is stale, ignoring it.\n");
hist_db = NULL;
}
fclose(sfp);
}
fclose(sfp);
} else {
if (fd >= 0)
close(fd);

15
misc/ss.c
View File

@ -697,8 +697,8 @@ struct dctcpstat {
struct tcpstat {
struct sockstat ss;
int timer;
int timeout;
unsigned int timer;
unsigned int timeout;
int probes;
char cong_alg[16];
double rto, ato, rtt, rttvar;
@ -869,13 +869,11 @@ static void sock_addr_print(const char *addr, char *delim, const char *port,
sock_addr_print_width(addr_width, addr, delim, serv_width, port, ifname);
}
static const char *print_ms_timer(int timeout)
static const char *print_ms_timer(unsigned int timeout)
{
static char buf[64];
int secs, msecs, minutes;
if (timeout < 0)
timeout = 0;
secs = timeout/1000;
minutes = secs/60;
secs = secs%60;
@ -3150,7 +3148,8 @@ static int unix_show(struct filter *f)
if (flags & (1 << 16)) {
u->state = SS_LISTEN;
} else {
} else if (u->state > 0 &&
u->state <= ARRAY_SIZE(unix_state_map)) {
u->state = unix_state_map[u->state-1];
if (u->type == SOCK_DGRAM && u->state == SS_CLOSE && u->rport)
u->state = SS_ESTABLISHED;
@ -3922,11 +3921,11 @@ static void _usage(FILE *dest)
" -F, --filter=FILE read filter information from FILE\n"
" FILTER := [ state STATE-FILTER ] [ EXPRESSION ]\n"
" STATE-FILTER := {all|connected|synchronized|bucket|big|TCP-STATES}\n"
" TCP-STATES := {established|syn-sent|syn-recv|fin-wait-{1,2}|time-wait|closed|close-wait|last-ack|listen|closing}\n"
" TCP-STATES := {established|syn-sent|syn-recv|fin-wait-{1,2}|time-wait|closed|close-wait|last-ack|listening|closing}\n"
" connected := {established|syn-sent|syn-recv|fin-wait-{1,2}|time-wait|close-wait|last-ack|closing}\n"
" synchronized := {established|syn-recv|fin-wait-{1,2}|time-wait|close-wait|last-ack|closing}\n"
" bucket := {syn-recv|time-wait}\n"
" big := {established|syn-sent|fin-wait-{1,2}|closed|close-wait|last-ack|listen|closing}\n"
" big := {established|syn-sent|fin-wait-{1,2}|closed|close-wait|last-ack|listening|closing}\n"
);
}

4
netem/maketable.c
View File

@ -38,8 +38,8 @@ readdoubles(FILE *fp, int *number)
}
for (i=0; i<limit; ++i){
fscanf(fp, "%lf", &x[i]);
if (feof(fp))
if (fscanf(fp, "%lf", &x[i]) != 1 ||
feof(fp))
break;
++n;
}

2
rdma/link.c
View File

@ -42,7 +42,7 @@ static const char *caps_to_str(uint32_t idx)
x(CAP_MASK_NOTICE, 22) \
x(BOOT_MGMT, 23) \
x(LINK_LATENCY, 24) \
x(CLIENT_REG, 23) \
x(CLIENT_REG, 25) \
x(IP_BASED_GIDS, 26)
enum { RDMA_PORT_FLAGS(RDMA_BITMAP_ENUM) };

7
tc/m_xt.c
View File

@ -95,7 +95,8 @@ build_st(struct xtables_target *target, struct xt_entry_target *t)
if (t == NULL) {
target->t = xtables_calloc(1, size);
target->t->u.target_size = size;
strcpy(target->t->u.user.name, target->name);
strncpy(target->t->u.user.name, target->name,
sizeof(target->t->u.user.name) - 1);
target->t->u.user.revision = target->revision;
if (target->init != NULL)
@ -277,8 +278,8 @@ static int parse_ipt(struct action_util *a, int *argc_p,
}
fprintf(stdout, " index %d\n", index);
if (strlen(tname) > 16) {
size = 16;
if (strlen(tname) >= 16) {
size = 15;
k[15] = 0;
} else {
size = 1 + strlen(tname);

10
tc/q_mqprio.c
View File

@ -34,10 +34,12 @@ static int mqprio_parse_opt(struct qdisc_util *qu, int argc,
{
int idx;
struct tc_mqprio_qopt opt = {
8,
{0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 1, 1, 3, 3, 3, 3},
1,
};
.num_tc = 8,
.prio_tc_map = { 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 1, 1, 3, 3, 3, 3 },
.hw = 1,
.count = { },
.offset = { },
};
while (argc > 0) {
idx = 0;

3
tc/q_netem.c
View File

@ -538,7 +538,7 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
int *ecn = NULL;
struct tc_netem_qopt qopt;
const struct tc_netem_rate *rate = NULL;
int len = RTA_PAYLOAD(opt) - sizeof(qopt);
int len;
__u64 rate64 = 0;
SPRINT_BUF(b1);
@ -546,6 +546,7 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
if (opt == NULL)
return 0;
len = RTA_PAYLOAD(opt) - sizeof(qopt);
if (len < 0) {
fprintf(stderr, "options size error\n");
return -1;

3
tc/tc_filter.c
View File

@ -412,6 +412,9 @@ static int tc_filter_get(int cmd, unsigned int flags, int argc, char **argv)
usage();
return 0;
} else {
if (!**argv)
invarg("invalid filter name", *argv);
strncpy(k, *argv, sizeof(k)-1);
q = get_filter_kind(k);

2
tipc/bearer.c
View File

@ -439,7 +439,7 @@ static int cmd_bearer_enable(struct nlmsghdr *nlh, const struct cmd *cmd,
return err;
opt = get_opt(opts, "media");
if (strcmp(opt->val, "udp") == 0) {
if (opt && strcmp(opt->val, "udp") == 0) {
err = nl_add_udp_enable_opts(nlh, opts, cmdl);
if (err)
return err;