linux-stable.git/net/can, branch v4.9.8

can: raw: raw_setsockopt: limit number of can_filter that can be set

2016-12-07T09:45:57+00:00

This patch adds a check to limit the number of can_filters that can be
set via setsockopt on CAN_RAW sockets. Otherwise allocations > MAX_ORDER
are not prevented resulting in a warning.

Reference: https://lkml.org/lkml/2016/12/2/230

Reported-by: Andrey Konovalov 
Tested-by: Andrey Konovalov 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde

can: bcm: fix support for CAN FD frames

2016-11-23T14:22:18+00:00

Since commit 6f3b911d5f29b98 ("can: bcm: add support for CAN FD frames") the
CAN broadcast manager supports CAN and CAN FD data frames.

As these data frames are embedded in struct can[fd]_frames which have a
different length the access to the provided array of CAN frames became
dependend of op->cfsiz. By using a struct canfd_frame pointer for the array of
CAN frames the new offset calculation based on op->cfsiz was accidently applied
to CAN FD frame element lengths.

This fix makes the pointer to the arrays of the different CAN frame types a
void pointer so that the offset calculation in bytes accesses the correct CAN
frame elements.

Reference: http://marc.info/?l=linux-netdev&m=147980658909653

Reported-by: Andrey Konovalov 
Signed-off-by: Oliver Hartkopp 
Tested-by: Andrey Konovalov 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde

can: bcm: fix warning in bcm_connect/proc_register

2016-10-31T19:48:19+00:00

Andrey Konovalov reported an issue with proc_register in bcm.c.
As suggested by Cong Wang this patch adds a lock_sock() protection and
a check for unsuccessful proc_create_data() in bcm_connect().

Reference: http://marc.info/?l=linux-netdev&m=147732648731237

Reported-by: Andrey Konovalov 
Suggested-by: Cong Wang 
Signed-off-by: Oliver Hartkopp 
Acked-by: Cong Wang 
Tested-by: Andrey Konovalov 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde

can: only call can_stat_update with procfs

2016-06-23T09:23:49+00:00

The change to leave out procfs support in CAN when CONFIG_PROC_FS
is not set was incomplete and leads to a build error:

net/built-in.o: In function `can_init':
:(.init.text+0x9858): undefined reference to `can_stat_update'
ERROR: "can_stat_update" [net/can/can.ko] undefined!

This tries a better approach, encapsulating all of the calls
within IS_ENABLED(), so we also leave out the timer function
from the object file.

Signed-off-by: Arnd Bergmann 
Fixes: a20fadf85312 ("can: build proc support only if CONFIG_PROC_FS is activated")
Signed-off-by: Marc Kleine-Budde

can: bcm: add support for CAN FD frames

2016-06-17T13:39:46+00:00

The programming API of the CAN_BCM depends on struct can_frame which is
given as array directly behind the bcm_msg_head structure. To follow this
schema for the CAN FD frames a new flag 'CAN_FD_FRAME' in the bcm_msg_head
flags indicates that the concatenated CAN frame structures behind the
bcm_msg_head are defined as struct canfd_frame.

This patch adds the support to handle CAN and CAN FD frames on a per BCM-op
base. Main changes:

- generally use struct canfd_frames instead if struct can_frames
- use canfd_frame.flags instead of can_frame.can_dlc for private BCM flags
- make all CAN frame sizes depending on the new CAN_FD_FRAME flags
- separate between CAN and CAN FD when sending/receiving frames

Due to the dependence of the CAN_FD_FRAME flag the former binary interface
for classic CAN frames remains stable.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: bcm: unify bcm_msg_head handling and prepare function parameters

2016-06-17T13:39:46+00:00

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: bcm: use CAN frame instead of can_frame in comments

2016-06-17T13:39:45+00:00

can_frame is the name of the struct can_frame which is not meant in
the corrected comments.

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: bcm: fix indention and other minor style issues

2016-06-17T13:39:45+00:00

Signed-off-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: build proc support only if CONFIG_PROC_FS is activated

2016-06-17T13:39:41+00:00

When building can subsystem with CONFIG_PROC_FS=n I detected some unused
variables warning by using proc functions. In CAN the proc handling is
nicely placed in one object file. This patch adds simple add a
dependency on CONFIG_PROC_FS for CAN's proc.o file and corresponding
static inline no-op functions.

Signed-off-by: Alexander Aring 
Acked-by: Oliver Hartkopp 
[mkl: provide static inline noops instead of using #ifdefs]
Signed-off-by: Marc Kleine-Budde

sock: enable timestamping using control messages

2016-04-04T19:50:30+00:00

Currently, SOL_TIMESTAMPING can only be enabled using setsockopt.
This is very costly when users want to sample writes to gather
tx timestamps.

Add support for enabling SO_TIMESTAMPING via control messages by
using tsflags added in `struct sockcm_cookie` (added in the previous
patches in this series) to set the tx_flags of the last skb created in
a sendmsg. With this patch, the timestamp recording bits in tx_flags
of the skbuff is overridden if SO_TIMESTAMPING is passed in a cmsg.

Please note that this is only effective for overriding the recording
timestamps flags. Users should enable timestamp reporting (e.g.,
SOF_TIMESTAMPING_SOFTWARE | SOF_TIMESTAMPING_OPT_ID) using
socket options and then should ask for SOF_TIMESTAMPING_TX_*
using control messages per sendmsg to sample timestamps for each
write.

Signed-off-by: Soheil Hassas Yeganeh 
Acked-by: Willem de Bruijn 
Signed-off-by: David S. Miller