* [PATCH 4/4] connector - documentation: simplify netlink message length assignment
From: Mathias Krause @ 2013-09-30 20:03 UTC (permalink / raw)
To: Evgeniy Polyakov; +Cc: Mathias Krause, netdev
In-Reply-To: <1380571389-15343-1-git-send-email-minipli@googlemail.com>
Use the precalculated size instead of obfuscating the message length
calculation by first subtracting the netlink header length from size
and then use the NLMSG_LENGTH() macro to add it back again.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
---
Documentation/connector/ucon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/connector/ucon.c b/Documentation/connector/ucon.c
index 4848db8..8a4da64 100644
--- a/Documentation/connector/ucon.c
+++ b/Documentation/connector/ucon.c
@@ -71,7 +71,7 @@ static int netlink_send(int s, struct cn_msg *msg)
nlh->nlmsg_seq = seq++;
nlh->nlmsg_pid = getpid();
nlh->nlmsg_type = NLMSG_DONE;
- nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));
+ nlh->nlmsg_len = size;
nlh->nlmsg_flags = 0;
m = NLMSG_DATA(nlh);
--
1.7.10.4
^ permalink raw reply related
* [PATCH 2/4] connector: use nlmsg_len() to check message length
From: Mathias Krause @ 2013-09-30 20:03 UTC (permalink / raw)
To: Evgeniy Polyakov; +Cc: Mathias Krause, netdev
In-Reply-To: <1380571389-15343-1-git-send-email-minipli@googlemail.com>
The current code tests the length of the whole netlink message to be
at least as long to fit a cn_msg. This is wrong as nlmsg_len includes
the length of the netlink message header. Use nlmsg_len() instead to
fix this "off-by-NLMSG_HDRLEN" size check.
Cc: stable@vger.kernel.org # v2.6.14+
Signed-off-by: Mathias Krause <minipli@googlemail.com>
---
drivers/connector/connector.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 6ecfa75..0daa11e 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -157,17 +157,18 @@ static int cn_call_callback(struct sk_buff *skb)
static void cn_rx_skb(struct sk_buff *__skb)
{
struct nlmsghdr *nlh;
- int err;
struct sk_buff *skb;
+ int len, err;
skb = skb_get(__skb);
if (skb->len >= NLMSG_HDRLEN) {
nlh = nlmsg_hdr(skb);
+ len = nlmsg_len(nlh);
- if (nlh->nlmsg_len < sizeof(struct cn_msg) ||
+ if (len < (int)sizeof(struct cn_msg) ||
skb->len < nlh->nlmsg_len ||
- nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) {
+ len > CONNECTOR_MAX_MSG_SIZE) {
kfree_skb(skb);
return;
}
--
1.7.10.4
^ permalink raw reply related
* [PATCH 3/4] connector: use 'size' everywhere in cn_netlink_send()
From: Mathias Krause @ 2013-09-30 20:03 UTC (permalink / raw)
To: Evgeniy Polyakov; +Cc: Mathias Krause, netdev
In-Reply-To: <1380571389-15343-1-git-send-email-minipli@googlemail.com>
We calculated the size for the netlink message buffer as size. Use size
in the memcpy() call as well instead of recalculating it.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
---
drivers/connector/connector.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 0daa11e..a36749f 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -109,7 +109,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
data = nlmsg_data(nlh);
- memcpy(data, msg, sizeof(*data) + msg->len);
+ memcpy(data, msg, size);
NETLINK_CB(skb).dst_group = group;
--
1.7.10.4
^ permalink raw reply related
* [PATCH 1/4] proc connector: fix info leaks
From: Mathias Krause @ 2013-09-30 20:03 UTC (permalink / raw)
To: Evgeniy Polyakov; +Cc: Mathias Krause, netdev
In-Reply-To: <1380571389-15343-1-git-send-email-minipli@googlemail.com>
Initialize event_data for all possible message types to prevent leaking
kernel stack contents to userland (up to 20 bytes). Also set the flags
member of the connector message to 0 to prevent leaking two more stack
bytes this way.
Cc: stable@vger.kernel.org # v2.6.15+
Signed-off-by: Mathias Krause <minipli@googlemail.com>
---
drivers/connector/cn_proc.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 08ae128..c73fc2b 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -65,6 +65,7 @@ void proc_fork_connector(struct task_struct *task)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -80,6 +81,7 @@ void proc_fork_connector(struct task_struct *task)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
/* If cn_netlink_send() failed, the data is not sent */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
@@ -96,6 +98,7 @@ void proc_exec_connector(struct task_struct *task)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -106,6 +109,7 @@ void proc_exec_connector(struct task_struct *task)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
@@ -122,6 +126,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
ev->what = which_id;
ev->event_data.id.process_pid = task->pid;
ev->event_data.id.process_tgid = task->tgid;
@@ -145,6 +150,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
@@ -160,6 +166,7 @@ void proc_sid_connector(struct task_struct *task)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -170,6 +177,7 @@ void proc_sid_connector(struct task_struct *task)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
@@ -185,6 +193,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -203,6 +212,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
@@ -218,6 +228,7 @@ void proc_comm_connector(struct task_struct *task)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -229,6 +240,7 @@ void proc_comm_connector(struct task_struct *task)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
@@ -244,6 +256,7 @@ void proc_coredump_connector(struct task_struct *task)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -254,6 +267,7 @@ void proc_coredump_connector(struct task_struct *task)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
@@ -269,6 +283,7 @@ void proc_exit_connector(struct task_struct *task)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
get_seq(&msg->seq, &ev->cpu);
ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -281,6 +296,7 @@ void proc_exit_connector(struct task_struct *task)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = 0; /* not used */
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
@@ -304,6 +320,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
msg = (struct cn_msg *)buffer;
ev = (struct proc_event *)msg->data;
+ memset(&ev->event_data, 0, sizeof(ev->event_data));
msg->seq = rcvd_seq;
ktime_get_ts(&ts); /* get high res monotonic timestamp */
put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -313,6 +330,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
msg->ack = rcvd_ack + 1;
msg->len = sizeof(*ev);
+ msg->flags = 0; /* not used */
cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
}
--
1.7.10.4
^ permalink raw reply related
* [PATCH 0/4] connector fixes
From: Mathias Krause @ 2013-09-30 20:03 UTC (permalink / raw)
To: Evgeniy Polyakov; +Cc: Mathias Krause, netdev
This series fixes a few netlink related issues of the connector interface.
The first two patches are bug fixes. The last two are cleanups.
Please apply!
Mathias Krause (4):
proc connector: fix info leaks
connector: use nlmsg_len() to check message length
connector: use 'size' everywhere in cn_netlink_send()
connector - documentation: simplify netlink message length assignment
Documentation/connector/ucon.c | 2 +-
drivers/connector/cn_proc.c | 18 ++++++++++++++++++
drivers/connector/connector.c | 9 +++++----
3 files changed, 24 insertions(+), 5 deletions(-)
--
1.7.10.4
^ permalink raw reply
* Re: [PATCH] pkt_sched: fq: qdisc dismantle fixes
From: David Miller @ 2013-09-30 19:51 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1380316801.30872.37.camel@edumazet-glaptop.roam.corp.google.com>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 27 Sep 2013 14:20:01 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> fq_reset() should drops all packets in queue, including
> throttled flows.
>
> This patch moves code from fq_destroy() to fq_reset()
> to do the cleaning.
>
> fq_change() must stop calling fq_dequeue() if all remaining
> packets are from throttled flows.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied, thanks Eric.
^ permalink raw reply
* Re: [PATCH net-next] qdisc: basic classifier - remove unnecessary initialization
From: David Miller @ 2013-09-30 19:48 UTC (permalink / raw)
To: stephen; +Cc: jhs, netdev
In-Reply-To: <20130926174216.447555bd@nehalam.linuxnetplumber.net>
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 26 Sep 2013 17:42:16 -0700
> err is set once, then first code resets it.
> err = tcf_exts_validate(...)
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Applied.
^ permalink raw reply
* Re: [PATCH net-next] qdisc: meta return ENOMEM on alloc failure
From: David Miller @ 2013-09-30 19:48 UTC (permalink / raw)
To: stephen; +Cc: tgraf, netdev
In-Reply-To: <20130926174011.22632779@nehalam.linuxnetplumber.net>
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 26 Sep 2013 17:40:11 -0700
> Rather than returning earlier value (EINVAL), return ENOMEM if
> kzalloc fails. Found while reviewing to find another EINVAL condition.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Applied.
^ permalink raw reply
* Re: [PATCH net-next 3/7] net: introduce new macro net_get_random_once
From: David Miller @ 2013-09-30 19:43 UTC (permalink / raw)
To: hannes; +Cc: netdev, edumazet
In-Reply-To: <1380236199-3726-4-git-send-email-hannes@stressinduktion.org>
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Fri, 27 Sep 2013 00:56:35 +0200
> +/* BE CAREFUL: this function is not interrupt safe */
> +#define net_get_random_once(buf, nbytes) \
> + ({ \
> + static bool ___done = false; \
> + bool ___ret = false; \
> + if (unlikely(!___done)) \
> + ___ret = __net_get_random_once(buf, \
> + nbytes, \
> + &___done); \
> + ___ret; \
> + })
I don't want to see this happening in every fast path, it's silly to test
this every time after the first iteration.
Maybe... _maybe_ I can be convinced if you use a static branch for this so
that it _really_ costs next to nothing.
But as-is I am not going to apply this series, sorry.
^ permalink raw reply
* Re: [PATCH net-next] bonding: trivial: remove forgotten bond_next_vlan()
From: David Miller @ 2013-09-30 19:39 UTC (permalink / raw)
To: vfalico; +Cc: netdev, fubar, andy
In-Reply-To: <1380237721-8229-1-git-send-email-vfalico@redhat.com>
From: Veaceslav Falico <vfalico@redhat.com>
Date: Fri, 27 Sep 2013 01:22:01 +0200
> It's a forgotten function declaration, which was removed some time ago
> already.
>
> CC: Jay Vosburgh <fubar@us.ibm.com>
> CC: Andy Gospodarek <andy@greyhouse.net>
> Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Applied.
^ permalink raw reply
* Re: [PATCH 0/3 - GIT PULL] include/linux: Remove externs from networking function prototypes
From: David Miller @ 2013-09-30 19:37 UTC (permalink / raw)
To: joe; +Cc: netdev, linux-kernel, linux-hippi, netfilter-devel, netfilter,
coreteam
In-Reply-To: <cover.1380233637.git.joe@perches.com>
From: Joe Perches <joe@perches.com>
Date: Thu, 26 Sep 2013 15:18:30 -0700
>
> The following changes since commit aae8c287e664d49df4aa315ad263c33b9a2af3e1:
>
> Merge branch 'bonding_neighbours' (2013-09-26 16:02:19 -0400)
>
> are available in the git repository at:
>
> git://repo.or.cz/linux-2.6/trivial-mods.git 20130926_include_linux_networking_externs
>
> for you to fetch changes up to f629d208d27a22f495b7734eede585b5d207e912:
>
> [networking]device.h: Remove extern from function prototypes (2013-09-26 15:06:58 -0700)
Pulled, thanks Joe.
^ permalink raw reply
* Re: [PATCH] net: flow_dissector: fix thoff for IPPROTO_AH
From: David Miller @ 2013-09-30 19:34 UTC (permalink / raw)
To: eric.dumazet; +Cc: nikolay, dborkman, netdev, andy, fubar, vfalico
In-Reply-To: <1380210246.3165.184.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 26 Sep 2013 08:44:06 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> In commit 8ed781668dd49 ("flow_keys: include thoff into flow_keys for
> later usage"), we missed that existing code was using nhoff as a
> temporary variable that could not always contain transport header
> offset.
>
> This is not a problem for TCP/UDP because port offset (@poff)
> is 0 for these protocols.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied and queued up for -stable, thanks Eric.
^ permalink raw reply
* [PATCH] isdn: eicon: free pointer after using it in log msg in divas_um_idi_delete_entity()
From: Jesper Juhl @ 2013-09-30 19:25 UTC (permalink / raw)
To: Armin Schindler; +Cc: Karsten Keil, netdev, linux-kernel
Not really a problem, but nice IMHO; the Coverity static analyzer
complains that we use the pointer 'e' after it has been freed, so move
the freeing below the final use, even if that use is just using the
value of the pointer and not actually dereferencing it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
drivers/isdn/hardware/eicon/um_idi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/isdn/hardware/eicon/um_idi.c b/drivers/isdn/hardware/eicon/um_idi.c
index 7cab5c3..e151971 100644
--- a/drivers/isdn/hardware/eicon/um_idi.c
+++ b/drivers/isdn/hardware/eicon/um_idi.c
@@ -288,9 +288,9 @@ int divas_um_idi_delete_entity(int adapter_nr, void *entity)
cleanup_entity(e);
diva_os_free(0, e->os_context);
memset(e, 0x00, sizeof(*e));
- diva_os_free(0, e);
DBG_LOG(("A(%d) remove E:%08x", adapter_nr, e));
+ diva_os_free(0, e);
return (0);
}
--
1.7.1
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
^ permalink raw reply related
* Re: [PATCH net-next] MAINTAINERS: add myself as maintainer of xen-netback
From: David Miller @ 2013-09-30 19:16 UTC (permalink / raw)
To: Ian.Campbell; +Cc: wei.liu2, netdev, xen-devel
In-Reply-To: <1380200887.29483.84.camel@kazak.uk.xensource.com>
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Thu, 26 Sep 2013 14:08:07 +0100
> On Thu, 2013-09-26 at 12:41 +0100, Wei Liu wrote:
>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
I've actually applied this to 'net', it's important that this
is accurate and it's a doc change so "safe" :-)
^ permalink raw reply
* Re: [PATCH net v6 1/1] xen-netback: Handle backend state transitions in a more robust way
From: David Miller @ 2013-09-30 19:14 UTC (permalink / raw)
To: Ian.Campbell; +Cc: paul.durrant, xen-devel, netdev, wei.liu2, david.vrabel
In-Reply-To: <1380200853.29483.83.camel@kazak.uk.xensource.com>
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Thu, 26 Sep 2013 14:07:33 +0100
> On Thu, 2013-09-26 at 12:09 +0100, Paul Durrant wrote:
>> When the frontend state changes netback now specifies its desired state to
>> a new function, set_backend_state(), which transitions through any
>> necessary intermediate states.
>> This fixes an issue observed with some old Windows frontend drivers where
>> they failed to transition through the Closing state and netback would not
>> behave correctly.
>>
>> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Applied, thanks.
^ permalink raw reply
* Re: pull request (net-next): ipsec-next 2013-09-26
From: David Miller @ 2013-09-30 19:12 UTC (permalink / raw)
To: steffen.klassert; +Cc: herbert, netdev
In-Reply-To: <1380185923-8976-1-git-send-email-steffen.klassert@secunet.com>
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 26 Sep 2013 10:58:41 +0200
> Two patches that are left from the last development cycle.
> Manual merging of include/net/xfrm.h is needed. The conflict
> can be solved as it is currently done in linux-next.
>
> 1) We announce the creation of temporary acquire state via an asyc event,
> so the deletion should be annunced too. From Nicolas Dichtel.
>
> 2) The VTI tunnels do not real tunning, they just provide a routable
> IPsec tunnel interface. So introduce and use xfrm_tunnel_notifier
> instead of xfrm_tunnel for xfrm tunnel mode callback. From Fan Du.
>
> Please pull or let me know if there are problems.
Pulled, thanks a lot!
^ permalink raw reply
* Re: [PATCH] hamradio: baycom: remove deprecated IRQF_DISABLED
From: David Miller @ 2013-09-30 19:09 UTC (permalink / raw)
To: michael.opdenacker; +Cc: t.sailer, linux-hams, netdev, linux-kernel
In-Reply-To: <1380133065-13712-1-git-send-email-michael.opdenacker@free-electrons.com>
From: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Date: Wed, 25 Sep 2013 20:17:45 +0200
> This patch proposes to remove the IRQF_DISABLED flag
> from drivers/net/hamradio/baycom_*
>
> It's a NOOP since 2.6.35 and it will be removed one day.
>
> Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Applied to net-next, thanks.
^ permalink raw reply
* Re: [PATCH net-next v3 2/2] dev: always advertise rx_flags changes via netlink
From: David Miller @ 2013-09-30 19:08 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: stephen, netdev
In-Reply-To: <1380103365-5185-2-git-send-email-nicolas.dichtel@6wind.com>
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Wed, 25 Sep 2013 12:02:45 +0200
> When flags IFF_PROMISC and IFF_ALLMULTI are changed, netlink messages are not
> consistent. For example, if a multicast daemon is running (flag IFF_ALLMULTI
> set in dev->flags but not dev->gflags, ie not exported to userspace) and then a
> user sets it via netlink (flag IFF_ALLMULTI set in dev->flags and dev->gflags, ie
> exported to userspace), no netlink message is sent.
> Same for IFF_PROMISC and because dev->promiscuity is exported via
> IFLA_PROMISCUITY, we may send a netlink message after each change of this
> counter.
>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next v3 1/2] dev: update __dev_notify_flags() to send rtnl msg
From: David Miller @ 2013-09-30 19:08 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: stephen, netdev
In-Reply-To: <1380103365-5185-1-git-send-email-nicolas.dichtel@6wind.com>
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Wed, 25 Sep 2013 12:02:44 +0200
> This patch only prepares the next one, there is no functional change.
> Now, __dev_notify_flags() can also be used to notify flags changes via
> rtnetlink.
>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Applied.
^ permalink raw reply
* Re: [PATCH] ipv6: Fix preferred_lft not updating in some cases
From: David Miller @ 2013-09-30 19:06 UTC (permalink / raw)
To: hannes; +Cc: pmarks, netdev, yoshfuji, lorenzo
In-Reply-To: <20130928202828.GB23654@order.stressinduktion.org>
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Sat, 28 Sep 2013 22:28:28 +0200
> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Applied, thanks everyone.
^ permalink raw reply
* Re: [PATCH] net: qmi_wwan: fix Cinterion PLXX product ID
From: David Miller @ 2013-09-30 19:04 UTC (permalink / raw)
To: Christian.Schmiedl-av01+Y74gORBDgjK7y7TUQ
Cc: aleksander-bhGbAngMcJvQT0dZR+AlfA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA, bjorn-yOkvZcmFvRU,
dcbw-H+wXaHxf7aLQT0dZR+AlfA,
Hans-Christoph.Schemmel-av01+Y74gORBDgjK7y7TUQ,
Nicolaus.Colberg-av01+Y74gORBDgjK7y7TUQ
In-Reply-To: <376FB829F3ECB542B825EAF4D8CA8A9701F9D6114530-6vtk6ynWDJf9L9UzlSODQOG7l92LEt8e@public.gmane.org>
From: Schmiedl Christian <Christian.Schmiedl-av01+Y74gORBDgjK7y7TUQ@public.gmane.org>
Date: Thu, 26 Sep 2013 16:02:13 +0200
> Aleksander Morgado <aleksander-bhGbAngMcJvQT0dZR+AlfA@public.gmane.org> writes:
>
>> Cinterion PLXX LTE devices have a 0x0060 product ID, not 0x12d1.
>>
>> The blacklisting in the serial/option driver does actually use the
>> correct PID, as per commit 8ff10bdb14a52e3f25d4ce09e0582a8684c1a6db
>> ('USB: Blacklisted Cinterion's PLxx WWAN Interface').
>
> Thanks for patching
>
> Acked-by: Christian Schmiedl <christian.schmiedl-av01+Y74gORBDgjK7y7TUQ@public.gmane.org>
Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH 2/2] net: qmi_wwan: fix checkpatch warnings
From: David Miller @ 2013-09-30 19:02 UTC (permalink / raw)
To: fabio.porcedda; +Cc: netdev, linux-usb, bjorn, dcbw
In-Reply-To: <1380100886-16531-2-git-send-email-fabio.porcedda@gmail.com>
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Wed, 25 Sep 2013 11:21:26 +0200
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Applied to net-next, thanks.
^ permalink raw reply
* Re: [PATCH 1/2] net: qmi_wwan: add Telit LE920 newer firmware support
From: David Miller @ 2013-09-30 19:02 UTC (permalink / raw)
To: fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA,
bjorn-yOkvZcmFvRU, dcbw-H+wXaHxf7aLQT0dZR+AlfA
In-Reply-To: <1380100886-16531-1-git-send-email-fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
From: Fabio Porcedda <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Wed, 25 Sep 2013 11:21:25 +0200
> Newer firmware use a new pid and a different interface.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Applied to net-next
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH 2/2] net: qmi_wwan: fix checkpatch warnings
From: David Miller @ 2013-09-30 19:00 UTC (permalink / raw)
To: bjorn; +Cc: fabio.porcedda, netdev, linux-usb, dcbw
In-Reply-To: <877ge5own8.fsf@nemi.mork.no>
From: Bjørn Mork <bjorn@mork.no>
Date: Wed, 25 Sep 2013 15:31:39 +0200
> Sorry, I really don't see the point of this. Yes, the lines are longer
> than 80 columns, but breaking them don't improve the readability at
> all. On the contrary, IMHO.
>
> So NAK from me for this part.
Sorry, breaking things up like this is what we do everywhere.
It's not strictly 80 columns but "about 80 columns".
And the only place we don't break things up is for messages that end
up in the kernel log. Those strings can take the line as long as is
reasonably necessary.
But at argument delimiters and operators for long complex expressions,
we break it up so that the lines do not significantly exceed 80
columns.
Anything else is your opinion, and not what we've been trying to do
consistently across the kernel and in particular in the networking.
Therefore this patch is perfectly fine and I intent to apply it.
^ permalink raw reply
* Re: [PATCH] moxa: drop free_irq of devm_request_irq allocated irq
From: David Miller @ 2013-09-30 18:55 UTC (permalink / raw)
To: weiyj.lk
Cc: grant.likely, rob.herring, jg1.han, jonas.jensen, yongjun_wei,
netdev
In-Reply-To: <CAPgLHd8YRP7kL_jNHi3J9jFn86f=Fv-AWWUY_aRGZQOgVTNPgg@mail.gmail.com>
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Wed, 25 Sep 2013 15:33:29 +0800
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> irq allocated with devm_request_irq should not be freed using
> free_irq, because doing so causes a dangling pointer, and a
> subsequent double free.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
I think this is a dangerous change, if the IRQ fires after the point
of the existing free_irq() call it will try to dereference the net
device struct which will be free by the time the devm release code
runes.
I'm not applying this patch, sorry.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox