From: Jeffrey Altman Date: Fri, 11 Nov 2011 16:00:47 +0000 (-0500) Subject: namei: tweak getlinkbyte error handling X-Git-Tag: upstream/1.6.1.pre1^2~100 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0e753b2949cc5127b75713b2e0d7dd3acd96a047;p=packages%2Fo%2Fopenafs.git namei: tweak getlinkbyte error handling in the event of a pread error, add the same error exit path trigger that we have elsewhere Reviewed-on: http://gerrit.openafs.org/5843 Reviewed-by: Andrew Deason Reviewed-by: Derrick Brashear Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman (cherry picked from commit 51f71e533b20cd875eec8adda71edea044a606da) Change-Id: I05623d392e7e3446b7b41dcc1778c6aca986bca1 Reviewed-on: http://gerrit.openafs.org/6078 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c index 42ae89eaa..9a1076a3f 100644 --- a/src/vol/namei_ops.c +++ b/src/vol/namei_ops.c @@ -1422,6 +1422,9 @@ namei_GetLinkCount(FdHandle_t * h, Inode ino, int lockit, int fixup, int nowrite } rc = FDH_PREAD(h, (char*)&row, sizeof(row), offset); + if (rc == -1) + goto bad_getLinkByte; + if ((rc == 0 || !((row >> index) & NAMEI_TAGMASK)) && fixup && nowrite) return 1; if (rc == 0 && fixup) {