| From | Kamal Mostafa <> | Subject | [PATCH 053/104] Smack: Fix the bug smackcipso can't set CIPSO correctly | Date | Thu, 10 Oct 2013 08:41:41 -0700 |
| |
3.8.13.11 -stable review patch. If anyone has any objections, please let me know.
------------------
From: "Passion,Zhao" <passion.zhao@intel.com>
commit 0fcfee61d63b82c1eefb5b1a914240480f17d63f upstream.
Bug report: https://tizendev.org/bugs/browse/TDIS-3891
The reason is userspace libsmack only use "smackfs/cipso2" long-label interface, but the code's logical is still for orginal fixed length label. Now update smack_cipso_apply() to support flexible label (<=256 including tailing '\0')
There is also a bug in kernel/security/smack/smackfs.c: When smk_set_cipso() parsing the CIPSO setting from userspace, the offset of CIPSO level should be "strlen(label)+1" instead of "strlen(label)"
Signed-off-by: Passion,Zhao <passion.zhao@intel.com> Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- security/smack/smackfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 76a5dca..c4fe705 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -818,7 +818,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, if (format == SMK_FIXED24_FMT) rule += SMK_LABELLEN; else - rule += strlen(skp->smk_known); + rule += strlen(skp->smk_known) + 1; ret = sscanf(rule, "%d", &maplevel); if (ret != 1 || maplevel > SMACK_CIPSO_MAXLEVEL) -- 1.8.1.2
|