Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2527ec4 authored by André Carvalho de Matos's avatar André Carvalho de Matos Committed by David S. Miller
Browse files

caif: Bugfix for socket priority, bindtodev and dbg channel. 



Changes:
o Bugfix: SO_PRIORITY for SOL_SOCKET could not be handled
  in caif's setsockopt,  using the struct sock attribute priority instead.

o Bugfix: SO_BINDTODEVICE for SOL_SOCKET could not be handled
  in caif's setsockopt,  using the struct sock attribute ifindex instead.

o Wrong assert statement for RFM layer segmentation.

o CAIF Debug channels was not working over SPI, caif_payload_info
  containing padding info must be initialized.

o Check on pointer before dereferencing when unregister dev in caif_dev.c

Signed-off-by: default avatarSjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6cc0e949

include/net/caif/caif_dev.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct caif_param { 
 * @sockaddr:		Socket address to connect.

 * @priority:		Priority of the connection.

 * @link_selector:	Link selector (high bandwidth or low latency)

 * @link_name:		Name of the CAIF Link Layer to use.

 * @ifindex:		kernel index of the interface.

 * @param:		Connect Request parameters (CAIF_SO_REQ_PARAM).

 *

 * This struct is used when connecting a CAIF channel.
@@ -39,7 +39,7 @@ struct caif_connect_request { 
	struct sockaddr_caif sockaddr;

	enum caif_channel_priority priority;

	enum caif_link_selector link_selector;

	char link_name[16];

	int ifindex;

	struct caif_param param;

};

include/net/caif/cfcnfg.h

+4 −4
Original line number Diff line number Diff line
@@ -139,10 +139,10 @@ struct dev_info *cfcnfg_get_phyid(struct cfcnfg *cnfg, 
		     enum cfcnfg_phy_preference phy_pref);



/**

 * cfcnfg_get_named() - Get the Physical Identifier of CAIF Link Layer

 * cfcnfg_get_id_from_ifi() - Get the Physical Identifier of ifindex,

 * 			it matches caif physical id with the kernel interface id.

 * @cnfg:	Configuration object

 * @name:	Name of the Physical Layer (Caif Link Layer)

 * @ifi:	ifindex obtained from socket.c bindtodevice.

 */

int cfcnfg_get_named(struct cfcnfg *cnfg, char *name);



int cfcnfg_get_id_from_ifi(struct cfcnfg *cnfg, int ifi);

#endif				/* CFCNFG_H_ */

net/caif/caif_config_util.c

+10 −3
Original line number Diff line number Diff line
@@ -16,11 +16,18 @@ int connect_req_to_link_param(struct cfcnfg *cnfg, 
{

	struct dev_info *dev_info;

	enum cfcnfg_phy_preference pref;

	int res;



	memset(l, 0, sizeof(*l));

	l->priority = s->priority;

	/* In caif protocol low value is high priority */

	l->priority = CAIF_PRIO_MAX - s->priority + 1;



	if (s->link_name[0] != '\0')

		l->phyid = cfcnfg_get_named(cnfg, s->link_name);

	if (s->ifindex != 0){

		res = cfcnfg_get_id_from_ifi(cnfg, s->ifindex);

		if (res < 0)

			return res;

		l->phyid = res;

	}

	else {

		switch (s->link_selector) {

		case CAIF_LINK_HIGH_BANDW:

net/caif/caif_dev.c

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,8 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, 


	case NETDEV_UNREGISTER:

		caifd = caif_get(dev);

		if (caifd == NULL)

			break;

		netdev_info(dev, "unregister\n");

		atomic_set(&caifd->state, what);

		caif_device_destroy(dev);

net/caif/caif_socket.c

+15 −30
Original line number Diff line number Diff line
@@ -716,8 +716,7 @@ static int setsockopt(struct socket *sock, 
{

	struct sock *sk = sock->sk;

	struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);

	int prio, linksel;

	struct ifreq ifreq;

	int linksel;



	if (cf_sk->sk.sk_socket->state != SS_UNCONNECTED)

		return -ENOPROTOOPT;
@@ -735,33 +734,6 @@ static int setsockopt(struct socket *sock, 
		release_sock(&cf_sk->sk);

		return 0;



	case SO_PRIORITY:

		if (lvl != SOL_SOCKET)

			goto bad_sol;

		if (ol < sizeof(int))

			return -EINVAL;

		if (copy_from_user(&prio, ov, sizeof(int)))

			return -EINVAL;

		lock_sock(&(cf_sk->sk));

		cf_sk->conn_req.priority = prio;

		release_sock(&cf_sk->sk);

		return 0;



	case SO_BINDTODEVICE:

		if (lvl != SOL_SOCKET)

			goto bad_sol;

		if (ol < sizeof(struct ifreq))

			return -EINVAL;

		if (copy_from_user(&ifreq, ov, sizeof(ifreq)))

			return -EFAULT;

		lock_sock(&(cf_sk->sk));

		strncpy(cf_sk->conn_req.link_name, ifreq.ifr_name,

			sizeof(cf_sk->conn_req.link_name));

		cf_sk->conn_req.link_name

			[sizeof(cf_sk->conn_req.link_name)-1] = 0;

		release_sock(&cf_sk->sk);

		return 0;



	case CAIFSO_REQ_PARAM:

		if (lvl != SOL_CAIF)

			goto bad_sol;
@@ -880,6 +852,18 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr, 
	sock->state = SS_CONNECTING;

	sk->sk_state = CAIF_CONNECTING;



	/* Check priority value comming from socket */

	/* if priority value is out of range it will be ajusted */

	if (cf_sk->sk.sk_priority > CAIF_PRIO_MAX)

		cf_sk->conn_req.priority = CAIF_PRIO_MAX;

	else if (cf_sk->sk.sk_priority < CAIF_PRIO_MIN)

		cf_sk->conn_req.priority = CAIF_PRIO_MIN;

	else

		cf_sk->conn_req.priority = cf_sk->sk.sk_priority;



	/*ifindex = id of the interface.*/

	cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;



	dbfs_atomic_inc(&cnt.num_connect_req);

	cf_sk->layer.receive = caif_sktrecv_cb;

	err = caif_connect_client(&cf_sk->conn_req,
@@ -905,6 +889,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr, 
	cf_sk->maxframe = mtu - (headroom + tailroom);

	if (cf_sk->maxframe < 1) {

		pr_warn("CAIF Interface MTU too small (%d)\n", dev->mtu);

		err = -ENODEV;

		goto out;

	}
@@ -1142,7 +1127,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, 
	set_rx_flow_on(cf_sk);



	/* Set default options on configuration */

	cf_sk->conn_req.priority = CAIF_PRIO_NORMAL;

	cf_sk->sk.sk_priority= CAIF_PRIO_NORMAL;

	cf_sk->conn_req.link_selector = CAIF_LINK_LOW_LATENCY;

	cf_sk->conn_req.protocol = protocol;

	/* Increase the number of sockets created. */