* [PATCH 1/3] can: fix handling of unmodifiable configuration options fix
2016-06-23 9:22 pull-request: can 2016-06-23 Marc Kleine-Budde
@ 2016-06-23 9:22 ` Marc Kleine-Budde
2016-06-23 9:22 ` [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage Marc Kleine-Budde
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2016-06-23 9:22 UTC (permalink / raw)
To: netdev; +Cc: davem, linux-can, kernel, Oliver Hartkopp, stable,
Marc Kleine-Budde
From: Oliver Hartkopp <socketcan@hartkopp.net>
With upstream commit bb208f144cf3f59 (can: fix handling of unmodifiable
configuration options) a new can_validate() function was introduced.
When invoking 'ip link set can0 type can' without any configuration data
can_validate() tries to validate the content without taking into account that
there's totally no content. This patch adds a check for missing content.
Reported-by: ajneu <ajneu1@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/dev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 910c12e2638e..348dd5001fa4 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -798,6 +798,9 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[])
* - control mode with CAN_CTRLMODE_FD set
*/
+ if (!data)
+ return 0;
+
if (data[IFLA_CAN_CTRLMODE]) {
struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);
--
2.8.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage
2016-06-23 9:22 pull-request: can 2016-06-23 Marc Kleine-Budde
2016-06-23 9:22 ` [PATCH 1/3] can: fix handling of unmodifiable configuration options fix Marc Kleine-Budde
@ 2016-06-23 9:22 ` Marc Kleine-Budde
2016-06-23 12:55 ` Sergei Shtylyov
2016-06-23 9:22 ` [PATCH 3/3] can: kvaser_usb: Add support for more Kvaser Leaf v2 devices Marc Kleine-Budde
2016-06-27 14:08 ` pull-request: can 2016-06-23 David Miller
3 siblings, 1 reply; 11+ messages in thread
From: Marc Kleine-Budde @ 2016-06-23 9:22 UTC (permalink / raw)
To: netdev; +Cc: davem, linux-can, kernel, Oliver Hartkopp, stable,
Marc Kleine-Budde
From: Oliver Hartkopp <socketcan@hartkopp.net>
For 'real' hardware CAN devices the netlink interface is used to set CAN
specific communication parameters. Real CAN hardware can not be created nor
removed with the ip tool ...
This patch adds a private dellink function for the CAN device driver interface
that does just nothing.
It's a follow up to commit 993e6f2fd ("can: fix oops caused by wrong rtnl
newlink usage") but for dellink.
Reported-by: ajneu <ajneu1@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/dev.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 348dd5001fa4..ad535a854e5c 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -1011,6 +1011,11 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
return -EOPNOTSUPP;
}
+static void can_dellink(struct net_device *dev, struct list_head *head)
+{
+ return;
+}
+
static struct rtnl_link_ops can_link_ops __read_mostly = {
.kind = "can",
.maxtype = IFLA_CAN_MAX,
@@ -1019,6 +1024,7 @@ static struct rtnl_link_ops can_link_ops __read_mostly = {
.validate = can_validate,
.newlink = can_newlink,
.changelink = can_changelink,
+ .dellink = can_dellink,
.get_size = can_get_size,
.fill_info = can_fill_info,
.get_xstats_size = can_get_xstats_size,
--
2.8.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage
2016-06-23 9:22 ` [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage Marc Kleine-Budde
@ 2016-06-23 12:55 ` Sergei Shtylyov
2016-06-23 13:01 ` Oliver Hartkopp
0 siblings, 1 reply; 11+ messages in thread
From: Sergei Shtylyov @ 2016-06-23 12:55 UTC (permalink / raw)
To: Marc Kleine-Budde, netdev
Cc: davem, linux-can, kernel, Oliver Hartkopp, stable
Hello.
On 6/23/2016 12:22 PM, Marc Kleine-Budde wrote:
> From: Oliver Hartkopp <socketcan@hartkopp.net>
>
> For 'real' hardware CAN devices the netlink interface is used to set CAN
> specific communication parameters. Real CAN hardware can not be created nor
> removed with the ip tool ...
>
> This patch adds a private dellink function for the CAN device driver interface
> that does just nothing.
>
> It's a follow up to commit 993e6f2fd ("can: fix oops caused by wrong rtnl
> newlink usage") but for dellink.
>
> Reported-by: ajneu <ajneu1@gmail.com>
> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> drivers/net/can/dev.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
> index 348dd5001fa4..ad535a854e5c 100644
> --- a/drivers/net/can/dev.c
> +++ b/drivers/net/can/dev.c
> @@ -1011,6 +1011,11 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
> return -EOPNOTSUPP;
> }
>
> +static void can_dellink(struct net_device *dev, struct list_head *head)
> +{
> + return;
Why?
> +}
> +
> static struct rtnl_link_ops can_link_ops __read_mostly = {
> .kind = "can",
> .maxtype = IFLA_CAN_MAX,
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage
2016-06-23 12:55 ` Sergei Shtylyov
@ 2016-06-23 13:01 ` Oliver Hartkopp
2016-06-23 13:09 ` Sergei Shtylyov
0 siblings, 1 reply; 11+ messages in thread
From: Oliver Hartkopp @ 2016-06-23 13:01 UTC (permalink / raw)
To: Sergei Shtylyov, Marc Kleine-Budde, netdev
Cc: davem, linux-can, kernel, stable
On 06/23/2016 02:55 PM, Sergei Shtylyov wrote:
> Hello.
>
> On 6/23/2016 12:22 PM, Marc Kleine-Budde wrote:
>
>> From: Oliver Hartkopp <socketcan@hartkopp.net>
>>
>> For 'real' hardware CAN devices the netlink interface is used to set CAN
>> specific communication parameters. Real CAN hardware can not be
>> created nor
>> removed with the ip tool ...
>>
>> This patch adds a private dellink function for the CAN device driver
>> interface
>> that does just nothing.
>>
>> It's a follow up to commit 993e6f2fd ("can: fix oops caused by wrong rtnl
>> newlink usage") but for dellink.
>>
>> Reported-by: ajneu <ajneu1@gmail.com>
>> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
>> Cc: <stable@vger.kernel.org>
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>> ---
>> drivers/net/can/dev.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
>> index 348dd5001fa4..ad535a854e5c 100644
>> --- a/drivers/net/can/dev.c
>> +++ b/drivers/net/can/dev.c
>> @@ -1011,6 +1011,11 @@ static int can_newlink(struct net *src_net,
>> struct net_device *dev,
>> return -EOPNOTSUPP;
>> }
>>
>> +static void can_dellink(struct net_device *dev, struct list_head *head)
>> +{
>> + return;
>
> Why?
>
http://marc.info/?l=linux-can&m=146651600421205&w=2
The same reason as for commit 993e6f2fd.
Regards,
Oliver
>> +}
>> +
>> static struct rtnl_link_ops can_link_ops __read_mostly = {
>> .kind = "can",
>> .maxtype = IFLA_CAN_MAX,
> [...]
>
> MBR, Sergei
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-can" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage
2016-06-23 13:01 ` Oliver Hartkopp
@ 2016-06-23 13:09 ` Sergei Shtylyov
2016-06-23 16:45 ` Oliver Hartkopp
0 siblings, 1 reply; 11+ messages in thread
From: Sergei Shtylyov @ 2016-06-23 13:09 UTC (permalink / raw)
To: Oliver Hartkopp, Marc Kleine-Budde, netdev
Cc: davem, linux-can, kernel, stable
On 6/23/2016 4:01 PM, Oliver Hartkopp wrote:
>>> From: Oliver Hartkopp <socketcan@hartkopp.net>
>>>
>>> For 'real' hardware CAN devices the netlink interface is used to set CAN
>>> specific communication parameters. Real CAN hardware can not be
>>> created nor
>>> removed with the ip tool ...
>>>
>>> This patch adds a private dellink function for the CAN device driver
>>> interface
>>> that does just nothing.
>>>
>>> It's a follow up to commit 993e6f2fd ("can: fix oops caused by wrong rtnl
>>> newlink usage") but for dellink.
>>>
>>> Reported-by: ajneu <ajneu1@gmail.com>
>>> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
>>> Cc: <stable@vger.kernel.org>
>>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>>> ---
>>> drivers/net/can/dev.c | 6 ++++++
>>> 1 file changed, 6 insertions(+)
>>>
>>> diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
>>> index 348dd5001fa4..ad535a854e5c 100644
>>> --- a/drivers/net/can/dev.c
>>> +++ b/drivers/net/can/dev.c
>>> @@ -1011,6 +1011,11 @@ static int can_newlink(struct net *src_net,
>>> struct net_device *dev,
>>> return -EOPNOTSUPP;
>>> }
>>>
>>> +static void can_dellink(struct net_device *dev, struct list_head *head)
>>> +{
>>> + return;
>>
>> Why?
>>
>
> http://marc.info/?l=linux-can&m=146651600421205&w=2
>
> The same reason as for commit 993e6f2fd.
I was asking just about the useless *return* statement...
> Regards,
> Oliver
MBR, Sergei
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage
2016-06-23 13:09 ` Sergei Shtylyov
@ 2016-06-23 16:45 ` Oliver Hartkopp
2016-06-28 7:36 ` Holger Schurig
0 siblings, 1 reply; 11+ messages in thread
From: Oliver Hartkopp @ 2016-06-23 16:45 UTC (permalink / raw)
To: Sergei Shtylyov, Marc Kleine-Budde, netdev
Cc: davem, linux-can, kernel, stable
On 06/23/2016 03:09 PM, Sergei Shtylyov wrote:
>>>> +static void can_dellink(struct net_device *dev, struct list_head
>>>> *head)
>>>> +{
>>>> + return;
>>>
>>> Why?
>>>
>>
>> http://marc.info/?l=linux-can&m=146651600421205&w=2
>>
>> The same reason as for commit 993e6f2fd.
>
> I was asking just about the useless *return* statement...
>
Ah!
I did some investigation before whether using 'return' in empty void
functions or not.
static void can_dellink(struct net_device *dev, struct list_head *head);
and
static void can_dellink(struct net_device *dev, struct list_head *head)
{
return;
}
do the same job, right?
But the first one looks like a forward declaration and you would try to
find the 'implementing' function then.
Of course you can write less code and both implementations are correct -
but this representation makes it pretty clear that here's nothing to do :-)
Regards,
Oliver
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage
2016-06-23 16:45 ` Oliver Hartkopp
@ 2016-06-28 7:36 ` Holger Schurig
2016-06-28 15:55 ` Oliver Hartkopp
0 siblings, 1 reply; 11+ messages in thread
From: Holger Schurig @ 2016-06-28 7:36 UTC (permalink / raw)
To: Oliver Hartkopp, Sergei Shtylyov, Marc Kleine-Budde, netdev
Cc: davem, linux-can, kernel, stable
> static void can_dellink(struct net_device *dev, struct list_head *head);
>
> and
>
> static void can_dellink(struct net_device *dev, struct list_head *head)
> {
> return;
> }
Wouldn't the canonical form be this:
static void can_dellink(struct net_device *dev, struct list_head *head)
{
}
- the curly braces make sure this isn't a forward definition
- but no useless return either
But then again, this "return" is only cosmetical. No compiler will
generate any code from it.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage
2016-06-28 7:36 ` Holger Schurig
@ 2016-06-28 15:55 ` Oliver Hartkopp
0 siblings, 0 replies; 11+ messages in thread
From: Oliver Hartkopp @ 2016-06-28 15:55 UTC (permalink / raw)
To: Holger Schurig, Sergei Shtylyov, Marc Kleine-Budde, netdev
Cc: davem, linux-can, kernel, stable
On 06/28/2016 09:36 AM, Holger Schurig wrote:
>> static void can_dellink(struct net_device *dev, struct list_head *head);
>>
>> and
>>
>> static void can_dellink(struct net_device *dev, struct list_head *head)
>> {
>> return;
>> }
>
> Wouldn't the canonical form be this:
>
> static void can_dellink(struct net_device *dev, struct list_head *head)
> {
> }
>
>
> - the curly braces make sure this isn't a forward definition
> - but no useless return either
>
>
> But then again, this "return" is only cosmetical.
Yes it is just coding style.
> No compiler will
> generate any code from it.
ACK.
If you check
~/linux$ git grep \{\ return\;
there are many occurrences of empty void functions having a 'return'
inside the curly braces.
I think
static void can_dellink( ... ){}
would have made it too.
Now can_dellink() just locks similar to can_newlink() some lines above.
Regards,
Oliver
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/3] can: kvaser_usb: Add support for more Kvaser Leaf v2 devices
2016-06-23 9:22 pull-request: can 2016-06-23 Marc Kleine-Budde
2016-06-23 9:22 ` [PATCH 1/3] can: fix handling of unmodifiable configuration options fix Marc Kleine-Budde
2016-06-23 9:22 ` [PATCH 2/3] can: fix oops caused by wrong rtnl dellink usage Marc Kleine-Budde
@ 2016-06-23 9:22 ` Marc Kleine-Budde
2016-06-27 14:08 ` pull-request: can 2016-06-23 David Miller
3 siblings, 0 replies; 11+ messages in thread
From: Marc Kleine-Budde @ 2016-06-23 9:22 UTC (permalink / raw)
To: netdev; +Cc: davem, linux-can, kernel, Jimmy Assarsson, Marc Kleine-Budde
From: Jimmy Assarsson <jimmyassarsson@gmail.com>
This patch adds support for Kvaser Leaf Light HS v2 OEM, Mini PCI
Express 2xHS and USBcan Light 2xHS.
Signed-off-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/Kconfig | 2 ++
drivers/net/can/usb/kvaser_usb.c | 8 +++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index 2ff0df32b3d1..8483a40e7e9e 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -47,6 +47,8 @@ config CAN_KVASER_USB
- Kvaser USBcan R
- Kvaser Leaf Light v2
- Kvaser Mini PCI Express HS
+ - Kvaser Mini PCI Express 2xHS
+ - Kvaser USBcan Light 2xHS
- Kvaser USBcan II HS/HS
- Kvaser USBcan II HS/LS
- Kvaser USBcan Rugged ("USBcan Rev B")
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 022bfa13ebfa..6f1f3b675ff5 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -59,11 +59,14 @@
#define USB_CAN_R_PRODUCT_ID 39
#define USB_LEAF_LITE_V2_PRODUCT_ID 288
#define USB_MINI_PCIE_HS_PRODUCT_ID 289
+#define USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID 290
+#define USB_USBCAN_LIGHT_2HS_PRODUCT_ID 291
+#define USB_MINI_PCIE_2HS_PRODUCT_ID 292
static inline bool kvaser_is_leaf(const struct usb_device_id *id)
{
return id->idProduct >= USB_LEAF_DEVEL_PRODUCT_ID &&
- id->idProduct <= USB_MINI_PCIE_HS_PRODUCT_ID;
+ id->idProduct <= USB_MINI_PCIE_2HS_PRODUCT_ID;
}
/* Kvaser USBCan-II devices */
@@ -537,6 +540,9 @@ static const struct usb_device_id kvaser_usb_table[] = {
.driver_info = KVASER_HAS_TXRX_ERRORS },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID) },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID) },
/* USBCANII family IDs */
{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN2_PRODUCT_ID),
--
2.8.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: pull-request: can 2016-06-23
2016-06-23 9:22 pull-request: can 2016-06-23 Marc Kleine-Budde
` (2 preceding siblings ...)
2016-06-23 9:22 ` [PATCH 3/3] can: kvaser_usb: Add support for more Kvaser Leaf v2 devices Marc Kleine-Budde
@ 2016-06-27 14:08 ` David Miller
3 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2016-06-27 14:08 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 23 Jun 2016 11:22:18 +0200
> this is a pull request of 3 patches for the upcoming linux-4.7 release.
>
> The first two patches are by Oliver Hartkopp fixing oopes in the generic CAN
> device netlink handling. Jimmy Assarsson's patch for the kvaser_usb driver adds
> support for more devices by adding their USB product ids.
Pulled, thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread