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

Commit de7b37cd authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] um: fix errno usage 



Avoid reusing userspace errno twice - it can be cleared by libc code
everywhere (in particular printk() does clear it in my setup).

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0f97869d

arch/um/drivers/daemon_user.c

+9 −8
Original line number Original line Diff line number Diff line
@@ -56,30 +56,31 @@ static int connect_to_switch(struct daemon_data *pri) 




	pri->control = socket(AF_UNIX, SOCK_STREAM, 0);

	pri->control = socket(AF_UNIX, SOCK_STREAM, 0);

	if(pri->control < 0){

	if(pri->control < 0){

		err = -errno;

		printk("daemon_open : control socket failed, errno = %d\n", 

		printk("daemon_open : control socket failed, errno = %d\n", 

		       errno);		

		       -err);

		return(-errno);

		return err;

	}

	}





	if(connect(pri->control, (struct sockaddr *) ctl_addr, 

	if(connect(pri->control, (struct sockaddr *) ctl_addr, 

		   sizeof(*ctl_addr)) < 0){

		   sizeof(*ctl_addr)) < 0){

		printk("daemon_open : control connect failed, errno = %d\n",

		       errno);

		err = -errno;

		err = -errno;

		printk("daemon_open : control connect failed, errno = %d\n",

		       -err);

		goto out;

		goto out;

	}

	}





	fd = socket(AF_UNIX, SOCK_DGRAM, 0);

	fd = socket(AF_UNIX, SOCK_DGRAM, 0);

	if(fd < 0){

	if(fd < 0){

		printk("daemon_open : data socket failed, errno = %d\n", 

		       errno);

		err = -errno;

		err = -errno;

		printk("daemon_open : data socket failed, errno = %d\n",

		       -err);

		goto out;

		goto out;

	}

	}

	if(bind(fd, (struct sockaddr *) local_addr, sizeof(*local_addr)) < 0){

	if(bind(fd, (struct sockaddr *) local_addr, sizeof(*local_addr)) < 0){

		printk("daemon_open : data bind failed, errno = %d\n", 

		       errno);

		err = -errno;

		err = -errno;

		printk("daemon_open : data bind failed, errno = %d\n",

		       -err);

		goto out_close;

		goto out_close;

	}

	}