lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 15 Aug 2012 15:46:22 -0400 From: Paul Gortmaker <paul.gortmaker@...driver.com> To: <stable@...r.kernel.org>, <linux-kernel@...r.kernel.org> CC: "Venkateswararao Jujjuri (JV)" <jvrao@...ux.vnet.ibm.com>, "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>, Eric Van Hensbergen <ericvh@...il.com>, Paul Gortmaker <paul.gortmaker@...driver.com> Subject: [v2.6.34-stable 038/165] net/9p: Fix the msize calculation. From: "Venkateswararao Jujjuri (JV)" <jvrao@...ux.vnet.ibm.com> ------------------- This is a commit scheduled for the next v2.6.34 longterm release. http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git If you see a problem with using this for longterm, please comment. ------------------- commit c9ffb05ca5b5098d6ea468c909dd384d90da7d54 upstream. msize represents the maximum PDU size that includes P9_IOHDRSZ. Signed-off-by: Venkateswararao Jujjuri "<jvrao@...ux.vnet.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@...ux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@...il.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@...driver.com> --- net/9p/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/9p/client.c b/net/9p/client.c index bd30c3b..1a1e6d5 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -775,8 +775,8 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) if (err) goto destroy_fidpool; - if ((clnt->msize+P9_IOHDRSZ) > clnt->trans_mod->maxsize) - clnt->msize = clnt->trans_mod->maxsize-P9_IOHDRSZ; + if (clnt->msize > clnt->trans_mod->maxsize) + clnt->msize = clnt->trans_mod->maxsize; err = p9_client_version(clnt); if (err) -- 1.7.12.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists