aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2016-01-16 18:50:27 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2016-01-16 18:50:27 +0000
commit07db3ca3c3893208b62018b43302f2c6bdab6935 (patch)
tree441663e56658209660de4d0e128ba1600e0a03e8
parent580390db677167e8512a918d88a6464ef3ade4f5 (diff)
Fix file descriptor leak in serial.c
Found by Coverity as "CID 1348465: Resource leaks". Corresponding to flashrom svn r1915. Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
-rw-r--r--serial.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/serial.c b/serial.c
index 257578a..a64a51d 100644
--- a/serial.c
+++ b/serial.c
@@ -282,18 +282,20 @@ fdtype sp_openserport(char *dev, int baud)
const int flags = fcntl(fd, F_GETFL);
if (flags == -1) {
msg_perr_strerror("Could not get serial port mode: ");
- return SER_INV_FD;
+ goto err;
}
if (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) != 0) {
msg_perr_strerror("Could not set serial port mode to blocking: ");
- return SER_INV_FD;
+ goto err;
}
if (serialport_config(fd, baud) != 0) {
- close(fd);
- return SER_INV_FD;
+ goto err;
}
return fd;
+err:
+ close(fd);
+ return SER_INV_FD;
#endif
}